diff --git a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/bpmn/behavior/IntermediateThrowSignalEventActivityBehavior.java b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/bpmn/behavior/IntermediateThrowSignalEventActivityBehavior.java
index 4d448b563c1bbf45bb3b3af61085d67e3edd99e7..d0e96d51a4e590fa89523d6cdcac9704184ce401 100644
--- a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/bpmn/behavior/IntermediateThrowSignalEventActivityBehavior.java
+++ b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/bpmn/behavior/IntermediateThrowSignalEventActivityBehavior.java
@@ -57,8 +57,8 @@ public class IntermediateThrowSignalEventActivityBehavior extends AbstractBpmnAc
     for (SignalEventSubscriptionEntity signalEventSubscriptionEntity : subscriptionEntities) {
       signalEventSubscriptionEntity.eventReceived(null, signalDefinition.isAsync());
     }
-    if (execution.getActivity() != null)
-    leave(execution);        
+    if (execution.getActivity() != null)  // dont continue if process has already finished
+       leave(execution);
   }
  
 }
diff --git a/modules/activiti-engine/src/test/resources/org/activiti/engine/test/bpmn/event/signal/SignalEventTests.earlyFinishedProcess.bpmn20.xml b/modules/activiti-engine/src/test/resources/org/activiti/engine/test/bpmn/event/signal/SignalEventTest.testEarlyFinishedProcess.bpmn20.xml
similarity index 96%
rename from modules/activiti-engine/src/test/resources/org/activiti/engine/test/bpmn/event/signal/SignalEventTests.earlyFinishedProcess.bpmn20.xml
rename to modules/activiti-engine/src/test/resources/org/activiti/engine/test/bpmn/event/signal/SignalEventTest.testEarlyFinishedProcess.bpmn20.xml
index f20a733bf3bd76187e35c1cbe537c78cb81e893e..3994314e36c4976a61bada54f9badc137e49b6d4 100644
--- a/modules/activiti-engine/src/test/resources/org/activiti/engine/test/bpmn/event/signal/SignalEventTests.earlyFinishedProcess.bpmn20.xml
+++ b/modules/activiti-engine/src/test/resources/org/activiti/engine/test/bpmn/event/signal/SignalEventTest.testEarlyFinishedProcess.bpmn20.xml
@@ -25,7 +25,7 @@
     <startEvent id="startevent2" name="Start"></startEvent>
     <endEvent id="endevent2" name="End"></endEvent>
     <intermediateThrowEvent id="signalintermediatethrowevent1" name="SignalThrowEvent">
-      <signalEventDefinition signalRef="signal1"></signalEventDefinition>
+      <signalEventDefinition signalRef="killSignal"></signalEventDefinition>
     </intermediateThrowEvent>
     <sequenceFlow id="flow6" sourceRef="startevent2" targetRef="signalintermediatethrowevent1"></sequenceFlow>
     <userTask id="usertask1" name="User Task" activiti:candidateGroups="group1"></userTask>