Index: /trunk/FACT++/src/HeadersFTM.h
===================================================================
--- /trunk/FACT++/src/HeadersFTM.h	(revision 14502)
+++ /trunk/FACT++/src/HeadersFTM.h	(revision 14503)
@@ -46,4 +46,5 @@
             kConfigError1 = 0x101,
             kConfigError2 = 0x102,
+            kConfigError3 = 0x103,
         };
     }
Index: /trunk/FACT++/src/ftmctrl.cc
===================================================================
--- /trunk/FACT++/src/ftmctrl.cc	(revision 14502)
+++ /trunk/FACT++/src/ftmctrl.cc	(revision 14503)
@@ -1164,4 +1164,6 @@
         throw runtime_error("ConnectionFTM::GetState - Impossible code reached.");
     }
+
+    bool IsLocked() const { return fHeader.fState&FTM::kFtmLocked; }
 
     int GetCounter(FTM::Types type) { return fCounter[type]; }
@@ -1917,4 +1919,6 @@
         }
 
+        // FIXME: Add timeouts and go to error state
+        //        so that a configuration error can be handled
         switch (T::GetCurrentState())
         {
@@ -1957,4 +1961,10 @@
             // will be received
             fCounterStat = fFTM.GetCounter(FTM::kStaticData);
+
+            if (!fFtm.IsLocked())
+            {
+                 T::Warn("Configuration successfull, but clock conditioner not locked.");
+                 return FTM::State::kConfigError3;
+            }
 
             T::Info(" ==> TODO: Update run in database!");
@@ -1975,4 +1985,6 @@
         }
 
+        // FIXME: Do we have to check the state of the clock conditioner here?
+
         if (T::GetCurrentState()==FTM::State::kConfigured &&
             fFTM.GetState()==ConnectionFTM::kTriggerOn)
@@ -2015,6 +2027,7 @@
                         "Ethernet connection to FTM established, FTM trigger output to FADs enabled.");
 
-        T::AddStateName(FTM::State::kConfigError1, "ErrorInConfig1", "");
-        T::AddStateName(FTM::State::kConfigError2, "ErrorInConfig2", "");
+        T::AddStateName(FTM::State::kConfigError1, "ErrorInConfig1", "Unexpected state received from FTM");
+        T::AddStateName(FTM::State::kConfigError2, "ErrorInConfig2", "Unexpected state received from FTM");
+        T::AddStateName(FTM::State::kConfigError3, "ClockCondError", "Clock conditioner not locked");
 
         // FTM Commands