diff --git a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/util/Activiti5Util.java b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/util/Activiti5Util.java
index ef14bc30b96956452d8e406be146558b983c9005..fb9c90884a3a91d8b81d869f0ff1e04e41b52a50 100644
--- a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/util/Activiti5Util.java
+++ b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/util/Activiti5Util.java
@@ -24,8 +24,17 @@ import org.activiti.engine.impl.persistence.entity.ProcessDefinitionEntity;
 public class Activiti5Util {
   
   public static boolean isActiviti5ProcessDefinitionId(CommandContext commandContext, String processDefinitionId) {
-    ProcessDefinitionEntity processDefinitionEntity = commandContext.getProcessDefinitionEntityManager()
-        .findProcessDefinitionById(processDefinitionId);
+    
+    if (processDefinitionId == null) {
+      return false;
+    }
+    
+    ProcessDefinitionEntity processDefinitionEntity = ProcessDefinitionUtil.getProcessDefinitionEntity(processDefinitionId, false);
+    
+    if (processDefinitionEntity == null) {
+      return false;
+    }
+    
     return isActiviti5ProcessDefinition(commandContext, processDefinitionEntity);
   }