diff --git a/src/ATBAPP/ATBDeviceControllerPlugin.cpp b/src/ATBAPP/ATBDeviceControllerPlugin.cpp
index 9a2d223..101f335 100644
--- a/src/ATBAPP/ATBDeviceControllerPlugin.cpp
+++ b/src/ATBAPP/ATBDeviceControllerPlugin.cpp
@@ -550,10 +550,14 @@ void ATBDeviceControllerPlugin::onAllDoorsClosed()
 {
     qCritical() << "ATBDeviceControllerPlugin::onAllDoorsClosed()";
 
-    emit this->requestModeIDLE();
-    this->dbus->finishedBackgroundTask("DOOR_OPEN");
+    if (this->diag->isErrorState()) {
+        emit this->requestModeOOO();
+    }
+    else {
+        emit this->requestModeIDLE();
+    }
 
-    // TODO: check for errors and create a machine event
+    this->dbus->finishedBackgroundTask("DOOR_OPEN");    
 }
 
 void ATBDeviceControllerPlugin::onNewVoltage(uint32_t voltage)