diff --git a/LXMF/LXMF.py b/LXMF/LXMF.py
index f199d01..040a551 100644
--- a/LXMF/LXMF.py
+++ b/LXMF/LXMF.py
@@ -1565,7 +1565,11 @@ class LXMRouter:
 
         for peer in culled_peers:
             RNS.log("Removing peer "+RNS.prettyhexrep(peer)+" due to excessive unreachability", RNS.LOG_WARNING)
-            self.peers.pop(peer_id)
+            try:
+                # TODO: Check this and add "if in" clause
+                self.peers.pop(peer_id)
+            except Exception as e:
+                RNS.log("Error while removing peer "+RNS.prettyhexrep(peer_id)+". The contained exception was: "+str(e), RNS.LOG_ERROR)    
 
 
     def fail_message(self, lxmessage):
@@ -1707,4 +1711,4 @@ class LXMRouter:
 
                         else:
                             RNS.log("Max delivery attempts reached for propagated "+str(lxmessage)+" to "+RNS.prettyhexrep(lxmessage.get_destination().hash), RNS.LOG_DEBUG)
-                            self.fail_message(lxmessage)
\ No newline at end of file
+                            self.fail_message(lxmessage)