Index: trunk/FACT++/src/drivectrl.cc
===================================================================
--- trunk/FACT++/src/drivectrl.cc	(revision 17344)
+++ trunk/FACT++/src/drivectrl.cc	(revision 17345)
@@ -1165,4 +1165,10 @@
     int Unlock()
     {
+        if (fDrive.GetState()==StateMachineImp::kSM_Error)
+        {
+            T::Warn("Drive in error - maybe no connection to electronics... trying to send STOP.");
+            SendStop();
+        }
+
         return Drive::State::kNotReady;
     }