diff --git a/jbpm-flow/src/main/java/org/jbpm/workflow/instance/node/EventNodeInstance.java b/jbpm-flow/src/main/java/org/jbpm/workflow/instance/node/EventNodeInstance.java
index 5240bc0b63..9a6dcf3fca 100644
--- a/jbpm-flow/src/main/java/org/jbpm/workflow/instance/node/EventNodeInstance.java
+++ b/jbpm-flow/src/main/java/org/jbpm/workflow/instance/node/EventNodeInstance.java
@@ -141,7 +141,16 @@ public void removeTimerListeners() {
     }
 
     public EventNode getEventNode() {
-        return (EventNode) getNode();
+        EventNode node;
+        try {
+            node = (EventNode) getNode();
+        } catch (ClassCastException e) {
+            long id = getProcessInstance().getId();
+            long nodeInstanceId = getId();
+            logger.debug("node definition changed for process instance "+id+". EventNode not found on node id: "+getNodeId()+" searching with node instance id: "+nodeInstanceId);
+            throw e;
+        }
+        return node;
     }
 
     public void triggerCompleted() {