Index: trunk/FACT++/src/ftmctrl.cc
===================================================================
--- trunk/FACT++/src/ftmctrl.cc	(revision 14955)
+++ trunk/FACT++/src/ftmctrl.cc	(revision 14956)
@@ -1957,9 +1957,10 @@
                 return FTM::State::kConfigError2;
             // ======================
+            /*
             if (!fFTM.IsLocked())
             {
                  T::Warn("Configuration successfull, but clock conditioner not locked.");
                  return FTM::State::kConfigError3;
-            }
+            }*/
             // ======================
 
@@ -1977,5 +1978,5 @@
         case FTM::State::kConfigError2:
         case FTM::State::kConfigError3:
-            return T::GetCurrentState();
+            break;
 
         default:
@@ -1994,5 +1995,13 @@
         if (T::GetCurrentState()==FTM::State::kConfigured &&
             fFTM.GetState()==ConnectionFTM::kTriggerOn)
+        {
+            if (!fFTM.IsLocked())
+            {
+                T::Warn("Configuration successfull, but clock conditioner not locked.");
+                return FTM::State::kConfigError3;
+            }
+
             return FTM::State::kTriggerOn;
+        }
 
         return T::GetCurrentState();