diff --git a/source/java/org/alfresco/repo/node/db/DbNodeServiceImpl.java b/source/java/org/alfresco/repo/node/db/DbNodeServiceImpl.java
index 59d344c35a..05e7cab3f7 100644
--- a/source/java/org/alfresco/repo/node/db/DbNodeServiceImpl.java
+++ b/source/java/org/alfresco/repo/node/db/DbNodeServiceImpl.java
@@ -988,7 +988,8 @@ public class DbNodeServiceImpl extends AbstractNodeServiceImpl
             // get the property definition
             PropertyDefinition propertyDef = dictionaryService.getProperty(propertyQName);
             
-            if ((propertyDef != null) && (propertyDef.getDataType().getName().equals(DataTypeDefinition.NODE_REF)) && (propertyValue.getStringValue() != null))
+            if ((propertyDef != null) && (propertyDef.getDataType().getName().equals(DataTypeDefinition.NODE_REF)) && 
+                (propertyValue != null) && (propertyValue.getStringValue() != null))
             {
             	propertyValue.setStringValue(tenantService.getBaseName(new NodeRef(propertyValue.getStringValue())).toString());
             }
@@ -1040,7 +1041,8 @@ public class DbNodeServiceImpl extends AbstractNodeServiceImpl
         // get the property definition
         PropertyDefinition propertyDef = dictionaryService.getProperty(qname);
         
-        if ((propertyDef != null) && (propertyDef.getDataType().getName().equals(DataTypeDefinition.NODE_REF)) && (propertyValue.getStringValue() != null))
+        if ((propertyDef != null) && (propertyDef.getDataType().getName().equals(DataTypeDefinition.NODE_REF)) && 
+            (propertyValue != null) && (propertyValue.getStringValue() != null))
         {
         	propertyValue.setStringValue(tenantService.getBaseName(new NodeRef(propertyValue.getStringValue())).toString());
         }