diff --git a/earwigbot/irc/connection.py b/earwigbot/irc/connection.py
index 3fdb6d3..10b6a4d 100644
--- a/earwigbot/irc/connection.py
+++ b/earwigbot/irc/connection.py
@@ -137,4 +137,5 @@ class IRCConnection(object):
             for line in lines:
                 self._process_message(line)
             if not self.is_running:
+                self._close()
                 break
diff --git a/earwigbot/main.py b/earwigbot/main.py
index 656633c..bdec1b3 100644
--- a/earwigbot/main.py
+++ b/earwigbot/main.py
@@ -102,9 +102,8 @@ def irc_frontend():
 
     frontend.loop()
 
-    if "irc_watcher" in config.components:
-        w_conn.close()
-    f_conn.close()
+    if  config.components.get("irc_watcher"):
+        watcher.is_running = False
 
 def main():
     if config.components.get("irc_frontend"):