diff --git a/source/java/org/alfresco/repo/node/db/DbNodeServiceImpl.java b/source/java/org/alfresco/repo/node/db/DbNodeServiceImpl.java
index 610ba64301..bc96a2e4f0 100644
--- a/source/java/org/alfresco/repo/node/db/DbNodeServiceImpl.java
+++ b/source/java/org/alfresco/repo/node/db/DbNodeServiceImpl.java
@@ -2247,7 +2247,8 @@ public class DbNodeServiceImpl extends AbstractNodeServiceImpl
         {
             Long childNodeId = oldChildNodePair.getFirst();
             NodeRef childNodeRef = oldChildNodePair.getSecond();
-            if (nodeDAO.getNodeRefStatus(childNodeRef).isDeleted())
+            NodeRef.Status childNodeStatus = nodeDAO.getNodeRefStatus(childNodeRef);
+            if (childNodeStatus == null || childNodeStatus.isDeleted())
             {
                 // Node has already been deleted.
                 continue;