diff --git a/client/gui.py b/client/gui.py
index 496d79fc1..0f6b714d7 100644
--- a/client/gui.py
+++ b/client/gui.py
@@ -865,8 +865,6 @@ class BitcoinGUI:
             self.show_message(e.message)
             return
             
-        self.update_session = True # we created a new change address
-
         status, msg = self.wallet.sendtx( tx )
         if status:
             self.show_message( "payment sent.\n" + msg )
diff --git a/client/interface.py b/client/interface.py
index 3e30997e7..307bc0a5a 100644
--- a/client/interface.py
+++ b/client/interface.py
@@ -162,7 +162,6 @@ class Interface:
             try:
                 self.is_connected = False
                 self.new_session(wallet.all_addresses(), wallet.electrum_version)
-                self.update_session = False
             except socket.error:
                 print "Not connected"
                 time.sleep(self.poll_interval())
@@ -174,11 +173,6 @@ class Interface:
 
             while True:
                 try:
-                    if self.is_connected and self.update_session:
-                        self.update_session( wallet.all_addresses() )
-                        self.update_session = False
-
-                    # define a method to update the list
                     if self.update_wallet(wallet):
                         self.update_session( wallet.all_addresses() )
 
@@ -190,6 +184,10 @@ class Interface:
                 except socket.gaierror:
                     self.is_connected = False
                     break
+                except socket.error:
+                    print "socket.error"
+                    self.is_connected = False
+                    break
                 except:
                     self.is_connected = False
                     print "error"