diff --git a/slapos/grid/slapgrid.py b/slapos/grid/slapgrid.py
index 47eec317b74d08fa876158dd4e4ac49ca0103fb6..4c7ff06934338588e15d95c01709921ec28e128b 100644
--- a/slapos/grid/slapgrid.py
+++ b/slapos/grid/slapgrid.py
@@ -618,7 +618,15 @@ class Slapgrid(object):
         clean_run = False
         exception = traceback.format_exc()
         logger.error(exception)
-        computer_partition.error(exception)
+        try:
+          computer_partition.error(exception)
+        except (SystemExit, KeyboardInterrupt):
+          raise
+        except Exception:
+          exception = traceback.format_exc()
+          logger.error('Problem during reporting error, continuing:\n' +
+            exception)
+
 
     logger.info("Finished computer partitions...")
     return clean_run