diff --git a/server/server.py b/server/server.py
index 0b8983d0..3a5d9f0d 100755
--- a/server/server.py
+++ b/server/server.py
@@ -345,6 +345,8 @@ def client_thread(ipaddr,conn):
         while 1:
             d = conn.recv(1024)
             msg += d
+            if not d: 
+                break
             if d[-1]=='#':
                 break