diff --git a/.settings/edu.umd.cs.findbugs.core.prefs b/.settings/edu.umd.cs.findbugs.core.prefs
index 798cc6c50ba0d44c0d2e3d82b54b6847d7c5a782..1ca927d6c804049f73ac411ab2af69f5d44a0ecc 100644
--- a/.settings/edu.umd.cs.findbugs.core.prefs
+++ b/.settings/edu.umd.cs.findbugs.core.prefs
@@ -1,5 +1,5 @@
 #FindBugs User Preferences
-#Tue Apr 28 16:12:41 CEST 2015
+#Thu Apr 30 13:44:10 CEST 2015
 detector_threshold=3
 effort=max
 excludefilter0=.fbExcludeFilterFile|true
diff --git a/src/main/java/teetime/framework/Analysis.java b/src/main/java/teetime/framework/Analysis.java
index 8d78e3669eec8894722f5953d608340908539776..a1773edb88f206853e05ea5d2aaa9fb2b28e45bd 100644
--- a/src/main/java/teetime/framework/Analysis.java
+++ b/src/main/java/teetime/framework/Analysis.java
@@ -128,11 +128,10 @@ public final class Analysis<T extends AnalysisConfiguration> implements Uncaught
 		if (threadableStageJobs.isEmpty()) {
 			throw new IllegalStateException("No stage was added using the addThreadableStage(..) method. Add at least one stage.");
 		}
-		AbstractExceptionListener newListener;
-		Set<Stage> intraStages;
+
 		for (Stage stage : threadableStageJobs) {
-			intraStages = traverseIntraStages(stage);
-			newListener = factory.createInstance();
+			Set<Stage> intraStages = traverseIntraStages(stage);
+			AbstractExceptionListener newListener = factory.createInstance();
 			switch (stage.getTerminationStrategy()) {
 			case BY_SIGNAL: {
 				final RunnableConsumerStage runnable = new RunnableConsumerStage(stage);
diff --git a/src/main/java/teetime/framework/pipe/SingleElementPipe.java b/src/main/java/teetime/framework/pipe/SingleElementPipe.java
index 703ada6bd16b40830990f3fc0a593cacb8324587..18c3423c7b703b84501b7c076e6dac85ba95c237 100644
--- a/src/main/java/teetime/framework/pipe/SingleElementPipe.java
+++ b/src/main/java/teetime/framework/pipe/SingleElementPipe.java
@@ -35,9 +35,12 @@ public final class SingleElementPipe extends AbstractIntraThreadPipe {
 
 	@Override
 	public boolean add(final Object element) {
-		this.element = element;
-		this.reportNewElement();
-		return true;
+		if (null != element) {
+			this.element = element;
+			this.reportNewElement();
+			return true;
+		}
+		return false;
 	}
 
 	@Override