diff --git a/src/test/java/teetime/framework/ExceptionHandling.java b/src/test/java/teetime/framework/ExceptionHandling.java
new file mode 100644
index 0000000000000000000000000000000000000000..78589966543d5687b1fbacd9f5393c758861bfdf
--- /dev/null
+++ b/src/test/java/teetime/framework/ExceptionHandling.java
@@ -0,0 +1,14 @@
+package teetime.framework;
+
+import static org.junit.Assert.*;
+
+import org.junit.Test;
+
+public class ExceptionHandling {
+
+	@Test
+	public void test() {
+		fail("Not yet implemented");
+	}
+
+}
diff --git a/src/test/java/teetime/framework/exceptionHandling/TestListener.java b/src/test/java/teetime/framework/exceptionHandling/TestListener.java
new file mode 100644
index 0000000000000000000000000000000000000000..d7f598bfd2a4877db0da42408c5449b2a7bca47d
--- /dev/null
+++ b/src/test/java/teetime/framework/exceptionHandling/TestListener.java
@@ -0,0 +1,13 @@
+package teetime.framework.exceptionHandling;
+
+import teetime.framework.Stage;
+
+public class TestListener extends StageExceptionListener {
+
+	@Override
+	public FurtherExecution onStageException(Exception e, Stage throwingStage) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+}