diff --git a/src/plugins/debugger/gdb/codagdbadapter.cpp b/src/plugins/debugger/gdb/codagdbadapter.cpp
index a88eb688aec..9eb53c934a2 100644
--- a/src/plugins/debugger/gdb/codagdbadapter.cpp
+++ b/src/plugins/debugger/gdb/codagdbadapter.cpp
@@ -988,10 +988,11 @@ void CodaGdbAdapter::sendRunControlTerminateCommand()
 void CodaGdbAdapter::handleRunControlTerminate(const CodaCommandResult &)
 {
     QString msg = QString::fromLatin1("CODA disconnected");
-    const bool emergencyShutdown = m_gdbProc.state() != QProcess::Running;
+    const bool emergencyShutdown = m_gdbProc.state() != QProcess::Running
+                                   && state() != EngineShutdownOk;
     if (emergencyShutdown)
-        msg += QString::fromLatin1(" (emergency shutdown");
-    logMessage(msg);
+        msg += QString::fromLatin1(" (emergency shutdown)");
+    logMessage(msg, LogMisc);
     if (emergencyShutdown) {
         cleanup();
         m_engine->notifyAdapterShutdownOk();
diff --git a/src/plugins/debugger/gdb/gdbengine.cpp b/src/plugins/debugger/gdb/gdbengine.cpp
index 2b04903d9f6..f32e7e230c4 100644
--- a/src/plugins/debugger/gdb/gdbengine.cpp
+++ b/src/plugins/debugger/gdb/gdbengine.cpp
@@ -1752,6 +1752,10 @@ void GdbEngine::notifyAdapterShutdownFailed()
 void GdbEngine::notifyAdapterShutdownOk()
 {
     QTC_ASSERT(state() == EngineShutdownRequested, qDebug() << state());
+    if (state() != EngineShutdownRequested) {
+        qDebug("XXXXX");
+        showMessage(_("ASSERT"));
+    }
     showMessage(_("INITIATE GDBENGINE SHUTDOWN IN STATE %1, PROC: %2")
         .arg(lastGoodState()).arg(gdbProc()->state()));
     m_commandsDoneCallback = 0;