diff --git a/accord-core/src/test/java/accord/utils/Property.java b/accord-core/src/test/java/accord/utils/Property.java
index d844ec4b4..64ad439f1 100644
--- a/accord-core/src/test/java/accord/utils/Property.java
+++ b/accord-core/src/test/java/accord/utils/Property.java
@@ -515,7 +515,7 @@ private <State, SystemUnderTest> void process(Command cmd, State state, SystemUn
                 cmd.process(state, sut);
                 return;
             }
-            TimeoutUtils.runBlocking(stepTimeout, "Stateful Step " + id, () -> cmd.process(state, sut));
+            TimeoutUtils.runBlocking(stepTimeout, "Stateful Step " + id + ": " + cmd.detailed(state), () -> cmd.process(state, sut));
         }
     }
 
diff --git a/accord-core/src/test/java/accord/utils/async/TimeoutUtils.java b/accord-core/src/test/java/accord/utils/async/TimeoutUtils.java
index 9754d604d..2b5b69a0e 100644
--- a/accord-core/src/test/java/accord/utils/async/TimeoutUtils.java
+++ b/accord-core/src/test/java/accord/utils/async/TimeoutUtils.java
@@ -59,7 +59,9 @@ public static void runBlocking(Duration timeout, String threadName, FailingRunna
         catch (TimeoutException e)
         {
             t.interrupt();
-            throw e;
+            TimeoutException e2 = new TimeoutException(threadName);
+            e2.setStackTrace(e.getStackTrace());
+            throw e2;
         }
     }
 }