diff --git a/boswatch/network/client.py b/boswatch/network/client.py
index 32808c2..beff672 100644
--- a/boswatch/network/client.py
+++ b/boswatch/network/client.py
@@ -47,11 +47,13 @@ class TCPClient:
 
             logging.debug("connected to " + str(host) + ":" + str(port))
             return True
+        except socket.timeout:
+            logging.warning("cannot connect to %s:%s - timeout after %s sec", str(host), str(port), self._timeout)
         except ConnectionRefusedError:
-            logging.error("cannot connect - connection refused")
+            logging.error("cannot connect to %s:%s - connection refused", str(host), str(port))
             return False
         except:  # pragma: no cover
-            logging.exception("cannot connect to " + str(host) + ":" + str(port))
+            logging.exception("cannot connect to %s:%s", str(host), str(port))
             return False
 
     def disconnect(self):
diff --git a/boswatch/network/server.py b/boswatch/network/server.py
index 9b99064..6e1d71f 100644
--- a/boswatch/network/server.py
+++ b/boswatch/network/server.py
@@ -80,7 +80,7 @@ class TCPServer(socketserver.ThreadingMixIn, socketserver.TCPServer):
 
         @return True or False"""
         try:
-            self._server = socketserver.ThreadingTCPServer(("localhost", port), TCPHandler)
+            self._server = socketserver.ThreadingTCPServer(("", port), TCPHandler)
             self._server.timeout = self._timeout
 
             self.flushData()