Index: /trunk/FACT++/src/StateMachineDimControl.cc
===================================================================
--- /trunk/FACT++/src/StateMachineDimControl.cc	(revision 18831)
+++ /trunk/FACT++/src/StateMachineDimControl.cc	(revision 18832)
@@ -93,8 +93,18 @@
     string opt(imp.GetString());
 
-    const map<string,string> data = Tools::Split(opt, true);
+    map<string,string> data;
+    try
+    {
+        data = Tools::Split(opt, true);
+    }
+    catch (const exception &e)
+    {
+        Warn("DIM_CONTROL/START: Parsing failed: "+opt+" ["+string(e.what())+"]");
+        return GetCurrentState();
+    }
+
     if (imp.GetSize()==0 || opt.size()==0 || opt[0]==0)
     {
-        Error("File name missing in DIM_CONTROL/START");
+        Error("DIM_CONTROL/START: File name missing.");
         return GetCurrentState();
     }
@@ -394,4 +404,7 @@
 int StateMachineDimControl::HandleServerAdd(const string &server)
 {
+    if (fIsServer && server=="DIM_CONTROL")
+        return GetCurrentState();
+
     if (server!="DIS_DNS")
     {