diff --git a/li.strolch.service/src/main/java/li/strolch/execution/EventBasedExecutionHandler.java b/li.strolch.service/src/main/java/li/strolch/execution/EventBasedExecutionHandler.java
index ef8db3f3a..95f6ccb7a 100644
--- a/li.strolch.service/src/main/java/li/strolch/execution/EventBasedExecutionHandler.java
+++ b/li.strolch.service/src/main/java/li/strolch/execution/EventBasedExecutionHandler.java
@@ -287,7 +287,10 @@ public class EventBasedExecutionHandler extends ExecutionHandler {
 							false)) {
 						tx.lock(activityLoc);
 
-						Activity activity = tx.findElement(activityLoc);
+						Activity activity = tx.findElement(activityLoc, true);
+						if (activity == null) {
+							return;
+						}
 
 						logger.info("Activity " + activity.getLocator() + " is in state " + activity.getState());