diff --git a/common/source/java/ch/systemsx/cisd/common/utilities/SystemExit.java b/common/source/java/ch/systemsx/cisd/common/utilities/SystemExit.java
index 294459453a2b83c5b395464eb1eb0d987521f581..f81fcdf0c6993f3def53c403d6d594cc61464f98 100644
--- a/common/source/java/ch/systemsx/cisd/common/utilities/SystemExit.java
+++ b/common/source/java/ch/systemsx/cisd/common/utilities/SystemExit.java
@@ -26,12 +26,19 @@ public class SystemExit implements IExitHandler
     /** The one and only one instance. */
     public static final IExitHandler SYSTEM_EXIT = new SystemExit();
     
+    //@Private
+    public static boolean throwException;
+    
     private SystemExit()
     {
     }
 
     public void exit(int exitCode)
     {
+        if (throwException)
+        {
+            throw new RuntimeException("Exit called with exit code " + exitCode);
+        }
         System.exit(exitCode);
     }