diff --git a/config/alfresco/messages/activiti-engine-messages.properties b/config/alfresco/messages/activiti-engine-messages.properties
index aad4893875..01ffee3015 100644
--- a/config/alfresco/messages/activiti-engine-messages.properties
+++ b/config/alfresco/messages/activiti-engine-messages.properties
@@ -37,7 +37,7 @@ activiti.engine.get.task.instance.error=Task instance {0} does not exist.
 activiti.engine.update.task.error=Failed to update workflow task {0}.
 activiti.engine.update.task.unexisting.error=Failed to update workflow task {0}, the task doesn't exist.
 activiti.engine.update.starttask.illegal.error=Failed to update workflow task {0}, start tasks cannot be updated in activiti.
-activiti.engine.end.task.invalid.transition=Transition {0} is invalid for Workflow task {1}, only transition {1} is allowed.
+activiti.engine.end.task.invalid.transition=Transition {0} is invalid for Workflow task {1}, only transition {2} is allowed.
 activiti.engine.end.task.unexisting.error=Failed to signal transition on task {0}, the task doesn't exist.
 activiti.engine.end.task.error=Failed to signal transition {0} from workflow task {1}.
 activiti.engine.get.task.by.id.error=Failed to retrieve task {0}.
diff --git a/source/java/org/alfresco/repo/workflow/activiti/ActivitiWorkflowEngine.java b/source/java/org/alfresco/repo/workflow/activiti/ActivitiWorkflowEngine.java
index 9630e9adb0..2369442a7f 100644
--- a/source/java/org/alfresco/repo/workflow/activiti/ActivitiWorkflowEngine.java
+++ b/source/java/org/alfresco/repo/workflow/activiti/ActivitiWorkflowEngine.java
@@ -1258,11 +1258,13 @@ public class ActivitiWorkflowEngine extends BPMEngine implements WorkflowEngine
         String outcomeValue = ActivitiConstants.DEFAULT_TRANSITION_NAME;
         HashMap<QName, Serializable> updates = new HashMap<QName, Serializable>();
 
+        boolean isDefaultTransition = transition == null || ActivitiConstants.DEFAULT_TRANSITION_NAME.equals(transition);
+
         Map<QName, Serializable> properties = propertyConverter.getTaskProperties(task, false);
         QName outcomePropName = (QName) properties.get(WorkflowModel.PROP_OUTCOME_PROPERTY_NAME);
         if(outcomePropName !=null)
         {
-            if(transition != null)
+            if(isDefaultTransition == false)
             {
                 outcomeValue = transition;
                 Serializable transitionValue = propertyConverter.convertValueToPropertyType(task, transition, outcomePropName);
@@ -1277,8 +1279,7 @@ public class ActivitiWorkflowEngine extends BPMEngine implements WorkflowEngine
                 }
             }
         }
-        else if (transition != null && 
-                ActivitiConstants.DEFAULT_TRANSITION_NAME.equals(transition)==false)
+        else if (isDefaultTransition==false)
         {
             // Only 'Next' is supported as transition.
             String taskId = createGlobalId(task.getId());