diff --git a/src/main/java/teetime/framework/AbstractRunnableStage.java b/src/main/java/teetime/framework/AbstractRunnableStage.java
index 0bc84bd0fa5b92a9151bc6699d498f8089b72429..afe8b851f632bec8dfa178f2b866b3279bff5e86 100644
--- a/src/main/java/teetime/framework/AbstractRunnableStage.java
+++ b/src/main/java/teetime/framework/AbstractRunnableStage.java
@@ -50,8 +50,7 @@ abstract class AbstractRunnableStage implements Runnable {
 					} while (!stage.shouldBeTerminated());
 				} catch (TerminateException e) {
 					this.stage.terminate();
-					stage.owningContext.getThreadService().onTerminate();
-					throw e; // FIXME: Still needed?
+					stage.owningContext.abortConfigurationRun();
 				} finally {
 					afterStageExecution();
 				}