diff --git a/src/plugins/coreplugin/actionmanager/actionmanager.cpp b/src/plugins/coreplugin/actionmanager/actionmanager.cpp
index b6cda842765..3ba89cdbb1b 100644
--- a/src/plugins/coreplugin/actionmanager/actionmanager.cpp
+++ b/src/plugins/coreplugin/actionmanager/actionmanager.cpp
@@ -551,6 +551,7 @@ ActionManager::ActionManager(QObject *parent)
 ActionManager::~ActionManager()
 {
     delete d;
+    d = nullptr;
 }
 
 /*!
@@ -734,6 +735,8 @@ QList<Command *> ActionManager::commands()
 */
 void ActionManager::unregisterAction(QAction *action, Id id)
 {
+    if (!d) // stray call during shutdown
+        return;
     Command *cmd = d->m_idCmdMap.value(id, nullptr);
     if (!cmd) {
         qWarning() << "unregisterAction: id" << id.name()