diff --git a/source/java/org/alfresco/repo/workflow/WorkflowServiceImpl.java b/source/java/org/alfresco/repo/workflow/WorkflowServiceImpl.java
index 51fd183968..7709ea86e2 100644
--- a/source/java/org/alfresco/repo/workflow/WorkflowServiceImpl.java
+++ b/source/java/org/alfresco/repo/workflow/WorkflowServiceImpl.java
@@ -1028,10 +1028,8 @@ public class WorkflowServiceImpl implements WorkflowService
         
         NodeRef initiatorRef = task.getPath().getInstance().getInitiator();
         
-        if (initiator != null)
+        if (initiatorRef != null && this.nodeService.exists(initiatorRef))
         {
-            // TODO: deal with missing users!
-            
             initiator = (String)this.nodeService.getProperty(initiatorRef, ContentModel.PROP_USERNAME);
         }