diff --git a/autotests/kimaptest/fakeserver.cpp b/autotests/kimaptest/fakeserver.cpp
--- a/autotests/kimaptest/fakeserver.cpp
+++ b/autotests/kimaptest/fakeserver.cpp
@@ -70,11 +70,16 @@
     QMutexLocker locker(&m_mutex);
 
     QTcpSocket *socket = qobject_cast<QTcpSocket *>(sender());
-    Q_ASSERT(socket != 0);
+    QVERIFY(socket != 0);
 
     int scenarioNumber = m_clientSockets.indexOf(socket);
 
-    QVERIFY(!m_scenarios[scenarioNumber].isEmpty());
+    if (m_scenarios[scenarioNumber].isEmpty()) {
+        KIMAP::ImapStreamParser *clientParser = m_clientParsers[scenarioNumber];
+        QByteArray received = "C: " + clientParser->readUntilCommandEnd().trimmed();
+        qWarning() << "Scenario" << scenarioNumber << "finished, but we got command" << received;
+        QVERIFY(false);
+    }
 
     readClientPart(scenarioNumber);
     writeServerPart(scenarioNumber);