1 files changed, 6 insertions, 0 deletions
diff --git a/rpkid/rpki/left_right.py b/rpkid/rpki/left_right.py
index d355d2c1..fd590b11 100644
--- a/rpkid/rpki/left_right.py
+++ b/rpkid/rpki/left_right.py
@@ -542,6 +542,8 @@ class child_elt(data_elt):
 
     try:
       q_msg.serve_top_level(self, done)
+    except rpki.async.ExitNow:
+      raise
     except rpki.exceptions.NoActiveCA, data:
       done(q_msg.serve_error(data))
     except Exception, data:
@@ -583,6 +585,8 @@ class repository_elt(data_elt):
         if len(r_msg) != 1 or isinstance(r_msg[0], rpki.publication.report_error_elt):
           raise rpki.exceptions.BadPublicationReply, "Unexpected response from pubd: %s" % msg
         callback()
+      except rpki.async.ExitNow:
+        raise
       except Exception, edata:
         errback(edata)
 
@@ -929,6 +933,8 @@ class msg(rpki.xml_utils.msg, left_right_namespace):
       try:
         q_pdu.gctx = gctx
         q_pdu.serve_dispatch(r_msg, iterator, fail)
+      except rpki.async.ExitNow:
+        raise
       except Exception, edata:
         fail(edata)