diff --git a/src/decentralizepy/communication/TCPRandomWalk.py b/src/decentralizepy/communication/TCPRandomWalk.py
index b1055afd61d7b3bb83394d0ca31329386718563a..98fd8e3327db92bf7383f93bcff0aa9bfdcf7e6a 100644
--- a/src/decentralizepy/communication/TCPRandomWalk.py
+++ b/src/decentralizepy/communication/TCPRandomWalk.py
@@ -309,9 +309,9 @@ class TCPRandomWalk(TCPRandomWalkBase):
         self.recv_queue.close()
         self.flag_running.value = 0
         #del self.lock
-        self.ctx.join()
         self.send_queue.join_thread()
         self.recv_queue.join_thread()
+        self.ctx.join()
         print(f"disconnect_neighbors: joined {self.uid}")
 
 
@@ -402,8 +402,10 @@ class TCPRandomWalkInternal(TCPRandomWalkBase):
         except BaseException as e:
             error_message = traceback.format_exc()
             print(error_message)
+            print("GOT EXCEPTION")
             logging.debug("GOT EXCEPTION")
             logging.debug(error_message)
+
         while not self.recv_queue.empty():
             print(f"{self.uid}: clear rcv")
             _ = self.recv_queue.get_nowait()