Index: /trunk/FACT++/src/ftmctrl.cc
===================================================================
--- /trunk/FACT++/src/ftmctrl.cc	(revision 12037)
+++ /trunk/FACT++/src/ftmctrl.cc	(revision 12038)
@@ -2275,13 +2275,13 @@
             }
 
-            FTM::StaticData data;
-
-            const uint16_t frq = conf.GetDef<uint16_t>("sampling-frequency.", *it);
-            if (fClockCondSetup.count(frq)==0)
+            if (!conf.HasDef("sampling-frequency.", *it))
             {
-                T::Error("sampling-frequency."+*it+" - frequency not available.");
+                T::Error("Neither sampling-frequency."+*it+" nor sampling-frequency.default found.");
                 return 2;
             }
 
+            const uint16_t frq = conf.GetDef<uint16_t>("sampling-frequency.", *it);
+
+            FTM::StaticData data;
             data.SetClockRegister(fClockCondSetup[frq].data());