diff --git a/electrum b/electrum
index fc3cebe0..533fc101 100755
--- a/electrum
+++ b/electrum
@@ -510,6 +510,7 @@ if __name__ == '__main__':
     s = get_daemon(config, False)
     if s:
         p = util.SocketPipe(s)
+        p.set_timeout(False)
         p.send(config_options)
         result = p.get()
         s.close()
diff --git a/lib/util.py b/lib/util.py
index f39fb39a..b66c66d8 100644
--- a/lib/util.py
+++ b/lib/util.py
@@ -392,7 +392,7 @@ class SocketPipe:
     def get(self):
         while True:
             response, self.message = parse_json(self.message)
-            if response:
+            if response is not None:
                 return response
             try:
                 data = self.socket.recv(1024)