1 files changed, 3 insertions, 3 deletions
diff --git a/rpkid/rootd.py b/rpkid/rootd.py
index 422ac5ce..aa2e7c2a 100755
--- a/rpkid/rootd.py
+++ b/rpkid/rootd.py
@@ -202,7 +202,7 @@ class cms_msg(rpki.up_down.cms_msg):
 def up_down_handler(query, path, cb):
   try:
     q_msg = cms_msg.unwrap(query, (bpki_ta, child_bpki_cert))
-  except rpki.async.ExitNow:
+  except (rpki.async.ExitNow, SystemExit):
     raise
   except Exception, data:
     rpki.log.error(traceback.format_exc())
@@ -214,13 +214,13 @@ def up_down_handler(query, path, cb):
 
   try:
     q_msg.serve_top_level(None, done)
-  except rpki.async.ExitNow:
+  except (rpki.async.ExitNow, SystemExit):
     raise
   except Exception, data:
     rpki.log.error(traceback.format_exc())
     try:
       done(q_msg.serve_error(data))
-    except rpki.async.ExitNow:
+    except (rpki.async.ExitNow, SystemExit):
       raise
     except Exception, data:
       rpki.log.error(traceback.format_exc())