Index: /trunk/FACT++/src/Connection.cc
===================================================================
--- /trunk/FACT++/src/Connection.cc	(revision 14576)
+++ /trunk/FACT++/src/Connection.cc	(revision 14577)
@@ -399,17 +399,26 @@
     }
 
-    tcp::resolver resolver(get_io_service());
+    const bool valid = !fAddress.empty() || !fPort.empty();
 
     boost::system::error_code ec;
 
-    tcp::resolver::query query(fAddress, fPort);
-    tcp::resolver::iterator iterator = resolver.resolve(query, ec);
-
     ostringstream msg;
-    if (!fAddress.empty() || !fPort.empty() || ec)
+    if (!valid)
+        msg << "No target address... connection attempt postponed.";
+    else
+    {
+        tcp::resolver resolver(get_io_service());
+
+        tcp::resolver::query query(fAddress, fPort);
+        tcp::resolver::iterator iterator = resolver.resolve(query, ec);
+
         msg << "Trying to connect to " << URL() << "...";
 
-    if (ec)
-        msg << " " << ec.message() << " (" << ec << ")";
+        // Start connection attempts (will also reset deadline counter)
+        if (!ec)
+            AsyncConnect(iterator);
+        else
+            msg << " " << ec.message() << " (" << ec << ")";
+    }
 
     // Only output message if it has changed
@@ -423,9 +432,6 @@
     }
 
-    if (ec)
+    if (!valid || ec)
         AsyncWait(fConnectionTimer, 250, &Connection::HandleConnectionTimer);
-    else
-        // Start connection attempts (will also reset deadline counter)
-        AsyncConnect(iterator);
 }