diff --git a/electrum b/electrum
index 533fc101..72a8de00 100755
--- a/electrum
+++ b/electrum
@@ -510,7 +510,7 @@ if __name__ == '__main__':
     s = get_daemon(config, False)
     if s:
         p = util.SocketPipe(s)
-        p.set_timeout(False)
+        p.set_timeout(1000000)
         p.send(config_options)
         result = p.get()
         s.close()
diff --git a/lib/util.py b/lib/util.py
index b66c66d8..0fef8483 100644
--- a/lib/util.py
+++ b/lib/util.py
@@ -403,7 +403,7 @@ class SocketPipe:
             except socket.error, err:
                 if err.errno == 60:
                     raise timeout
-                elif err.errno in [11, 10035]:
+                elif err.errno in [11, 35, 10035]:
                     print_error("socket errno", err.errno)
                     time.sleep(0.1)
                     continue