diff --git a/src/IRCBot.py b/src/IRCBot.py
index 52fc8d71..637a8352 100644
--- a/src/IRCBot.py
+++ b/src/IRCBot.py
@@ -271,6 +271,8 @@ class Bot(object):
         while self.running or not self._event_queue.empty():
             if not self.servers:
                 self._kill()
+                self.log.warn("No servers, exiting")
+                continue
 
             kill = False
             item = self._event_queue.get(block=True, timeout=None)