diff --git a/daemons/ganeti-watcher b/daemons/ganeti-watcher
index 509d800388b3a09acda0fc3cca4a0262b6d9d1ac..6e4ebf1739f2fa218bc1ec4003c517d54d864908 100755
--- a/daemons/ganeti-watcher
+++ b/daemons/ganeti-watcher
@@ -477,6 +477,8 @@ def main():
       # Just exit if there's no configuration
       sys.exit(constants.EXIT_SUCCESS)
     watcher.Run()
+  except SystemExit:
+    raise
   except NotMasterError:
     logging.debug("Not master, exiting")
     sys.exit(constants.EXIT_NOTMASTER)