diff --git a/li.strolch.service/src/main/java/li/strolch/execution/policy/SimplePlanning.java b/li.strolch.service/src/main/java/li/strolch/execution/policy/SimplePlanning.java
index bccf45051..a9e694cef 100644
--- a/li.strolch.service/src/main/java/li/strolch/execution/policy/SimplePlanning.java
+++ b/li.strolch.service/src/main/java/li/strolch/execution/policy/SimplePlanning.java
@@ -19,8 +19,12 @@ public class SimplePlanning extends PlanningPolicy {
 
 	@Override
 	public Resource evaluateAndSetResource(Action action) {
-		tx().lock(Resource.locatorFor(action.getResourceType(), action.getResourceId()));
-		return tx().getResourceBy(action.getResourceType(), action.getResourceId());
+		if (action.hasResourceDefined()) {
+			tx().lock(action.getResourceLocator());
+			return tx().getResourceBy(action.getResourceType(), action.getResourceId());
+		}
+
+		return null;
 	}
 
 	/**