diff --git a/src/main/java/teetime/framework/Execution.java b/src/main/java/teetime/framework/Execution.java
index dec7dc2c48945b27167f78c8063a5fc2ea1277d9..3b843c1391f5d7a9a64fb5199ad8855623e29879 100644
--- a/src/main/java/teetime/framework/Execution.java
+++ b/src/main/java/teetime/framework/Execution.java
@@ -263,6 +263,7 @@ public final class Execution<T extends Configuration> implements UncaughtExcepti
 		for (Stage stage : configuration.getContext().getThreadableStages().keySet()) {
 			stage.terminate();
 		}
+		waitForTermination();
 	}
 
 	/**
diff --git a/src/main/java/teetime/framework/service/RuntimeException.java b/src/main/java/teetime/framework/service/RuntimeException.java
new file mode 100644
index 0000000000000000000000000000000000000000..9a705a3589705b4dea2b650b0ac8296bc8f10e52
--- /dev/null
+++ b/src/main/java/teetime/framework/service/RuntimeException.java
@@ -0,0 +1,5 @@
+package teetime.framework.service;
+
+public class RuntimeException {
+
+}