diff --git a/common/source/java/ch/systemsx/cisd/common/process/ProcessExecutionHelper.java b/common/source/java/ch/systemsx/cisd/common/process/ProcessExecutionHelper.java
index d8be0b73dd6e5fdf1e372586cdc81f4eb90f49fb..f32d29e965625edf01b91e55168d252243ad2a47 100644
--- a/common/source/java/ch/systemsx/cisd/common/process/ProcessExecutionHelper.java
+++ b/common/source/java/ch/systemsx/cisd/common/process/ProcessExecutionHelper.java
@@ -332,11 +332,7 @@ public final class ProcessExecutionHelper
                 {
                     processWrapper.set(process);
                     final int exitValue = process.waitFor();
-                    if (processWrapper.getAndSet(null) == null)
-                    {
-                        // Value is irrelevant, the ProcessKiller got us.
-                        return null;
-                    }
+                    processWrapper.set(null);
                     List<String> processOutput = null;
                     if (OutputReadingStrategy.ALWAYS.equals(outputReadingStrategy)
                             || (OutputReadingStrategy.ON_ERROR.equals(outputReadingStrategy) && ProcessResult