diff --git a/pisi/comariface.py b/pisi/comariface.py
index 21e4310c..31932977 100644
--- a/pisi/comariface.py
+++ b/pisi/comariface.py
@@ -65,10 +65,6 @@ def wait_for_result(com, package_name=None):
         except KeyboardInterrupt:
             raise
         except Exception, e: #FIXME: what exception could we catch here, replace with that.
-            # TODO: we return here but we can also set self.config_later?
-            if ctx.keyboard_interrupt_pending():
-                return
-
             # Comar postInstall does a "service comar restart" which cuts
             # our precious communication link, so we waitsss
             if package_name == "comar":
@@ -76,6 +72,8 @@ def wait_for_result(com, package_name=None):
                     raise Error, _("Could not restart comar")
                 return
             else:
+                if ctx.keyboard_interrupt_pending():
+                    return
                 raise Error, _("connection with comar unexpectedly closed")
         
         cmd = reply[0]