diff --git a/source/java/org/alfresco/rest/api/search/impl/ResultMapper.java b/source/java/org/alfresco/rest/api/search/impl/ResultMapper.java
index 4220af37fb..0c241beff8 100644
--- a/source/java/org/alfresco/rest/api/search/impl/ResultMapper.java
+++ b/source/java/org/alfresco/rest/api/search/impl/ResultMapper.java
@@ -206,8 +206,11 @@ public class ResultMapper
                 Version v = null;
                 try
                 {
-                    v = nodeVersions.findVersion(frozenNodeRef.getId(),versionLabelId);
-                    aNode = nodes.getFolderOrDocument(v.getFrozenStateNodeRef(), null, null, params.getInclude(), mapUserInfo);
+                    if (frozenNodeRef != null && versionLabelId != null)
+                    {
+                        v = nodeVersions.findVersion(frozenNodeRef.getId(),versionLabelId);
+                        aNode = nodes.getFolderOrDocument(v.getFrozenStateNodeRef(), null, null, params.getInclude(), mapUserInfo);
+                    }
                 }
                 catch (EntityNotFoundException|InvalidNodeRefException e)
                 {