diff --git a/edmond/bot.py b/edmond/bot.py
index 7c6f1bc..0e47d00 100644
--- a/edmond/bot.py
+++ b/edmond/bot.py
@@ -114,6 +114,8 @@ class Bot(irc.client.SimpleIRCClient, Logger):
         try:
             self.start()
         except KeyboardInterrupt:
+            self.log_i("Caught keyboard interrupt.")
+        finally:
             self.log_i("Stopping Edmond.")
             self.__save_storage()