1 files changed, 5 insertions, 1 deletions
diff --git a/cryptech_muxd b/cryptech_muxd
index 5b458a4..d28f758 100755
--- a/cryptech_muxd
+++ b/cryptech_muxd
@@ -437,5 +437,9 @@ def main():
 if __name__ == "__main__":
     try:
         tornado.ioloop.IOLoop.current().run_sync(main)
-    except KeyboardInterrupt:
+    except (SystemExit, KeyboardInterrupt):
         pass
+    except:
+        logger.exception("Unhandled exception")
+    else:
+        logger.debug("Main loop exited")