diff --git a/src/main/java/teetime/framework/RunnableProducerStage.java b/src/main/java/teetime/framework/RunnableProducerStage.java
index 8feebfebc303c3f06d2e804ff3bed4a7356ae4c3..e158bda285c233a48c03a79cff53aa925b0bfe59 100644
--- a/src/main/java/teetime/framework/RunnableProducerStage.java
+++ b/src/main/java/teetime/framework/RunnableProducerStage.java
@@ -16,13 +16,23 @@
 package teetime.framework;
 
 import teetime.framework.exceptionHandling.StageExceptionHandler;
+import teetime.framework.exceptionHandling.TerminatingStageListener;
 import teetime.framework.signal.StartingSignal;
 import teetime.framework.signal.TerminatingSignal;
 
 public final class RunnableProducerStage extends AbstractRunnableStage {
 
-	public RunnableProducerStage(final Stage stage, final StageExceptionHandler listener) {
-		super(stage, listener);
+	/**
+	 * Uses the {@link TerminatingStageListener} as default exception handler
+	 * 
+	 * @param stage
+	 */
+	public RunnableProducerStage(final Stage stage) {
+		super(stage, new TerminatingStageListener());
+	}
+
+	public RunnableProducerStage(final Stage stage, final StageExceptionHandler handler) {
+		super(stage, handler);
 	}
 
 	@Override
diff --git a/src/site/markdown/wiki b/src/site/markdown/wiki
index 63ccbbc87bd2c0e6599ca91502149dba3cfb99de..0e4474577e1f49bc96e734c286b2d9e0363895e8 160000
--- a/src/site/markdown/wiki
+++ b/src/site/markdown/wiki
@@ -1 +1 @@
-Subproject commit 63ccbbc87bd2c0e6599ca91502149dba3cfb99de
+Subproject commit 0e4474577e1f49bc96e734c286b2d9e0363895e8