Index: /trunk/FACT++/src/fadctrl.cc
===================================================================
--- /trunk/FACT++/src/fadctrl.cc	(revision 11327)
+++ /trunk/FACT++/src/fadctrl.cc	(revision 11328)
@@ -1627,10 +1627,4 @@
         // ^^^^^ for debugging ^^^^^
 
-        if (!(conf.Has("base-addr") ^ conf.Has("addr")))
-        {
-           T::Out() << kRed << "EvalConfiguration - Only --base-addr or --addr allowed." << endl;
-           return 2;
-        }
-
         if (conf.Has("base-addr"))
         {
@@ -1661,4 +1655,8 @@
                     AddEndpoint(tcp::endpoint(ba::ip::address_v4(target), endpoint.port()));
                 }
+
+            StartConnection();
+            return -1;
+
         }
 
@@ -1674,7 +1672,8 @@
                 AddEndpoint(endpoint);
             }
-        }
-
-        StartConnection();
+
+            StartConnection();
+            return -1;
+        }
 
         return -1;
