diff --git a/test/multipEp.py b/test/multipEp.py
index 9b4ea3f..4adfca1 100644
--- a/test/multipEp.py
+++ b/test/multipEp.py
@@ -336,6 +336,7 @@ def run_scenario(scenario):
         handshakes_validated = manager.list()
 
         sc = scenario()
+        t = None
         try:
             action = next(sc)
             while True:
@@ -357,7 +358,9 @@ def run_scenario(scenario):
         except StopIteration: 
             pass
         except : 
+            t,v,tv = sys.exc_info()
             import traceback
+            print("EXCEPTION IN: " + scenario.__name__)
             traceback.print_exc()
 
         if "wait_for_cleanup" in sys.argv:
@@ -369,6 +372,9 @@ def run_scenario(scenario):
 
         purge_instances()
 
+        if t: 
+            raise t(v).with_traceback(tv)
+
 def cycle_until_no_change(*instancelist, maxcycles=20):
     count = 0
     while True: