1 files changed, 3 insertions, 4 deletions
diff --git a/pyLoadCore.py b/pyLoadCore.py
index e7911a65b..fbce78aaf 100755
--- a/pyLoadCore.py
+++ b/pyLoadCore.py
@@ -158,9 +158,8 @@ class Core(object):
 
         while True:
             sleep(2)
-            if self.do_kill:
-                self.logger.info("pyLoad quits")
-                exit()
+            if self.do_kill:
+                raise KeyboardInterrupt
 
     def init_server(self):
         try:
@@ -489,6 +488,6 @@ if __name__ == "__main__":
     try:
         pyload_core.start()
     except KeyboardInterrupt:
-        pyload_core.logger.info("killed pyLoad by Terminal")
+        pyload_core.logger.info("killed pyLoad")
         exit()