diff --git a/rm-server/source/java/org/alfresco/repo/model/filefolder/ExtendedFileFolderServiceImpl.java b/rm-server/source/java/org/alfresco/repo/model/filefolder/ExtendedFileFolderServiceImpl.java
index 1cd984e2a6..10e3fc2a2c 100644
--- a/rm-server/source/java/org/alfresco/repo/model/filefolder/ExtendedFileFolderServiceImpl.java
+++ b/rm-server/source/java/org/alfresco/repo/model/filefolder/ExtendedFileFolderServiceImpl.java
@@ -33,7 +33,10 @@ public class ExtendedFileFolderServiceImpl extends FileFolderServiceImpl
         finally
         {
             recordService.enablePropertyEditableCheck();
-            recordService.disablePropertyEditableCheck(result.getNodeRef());
+            if (result != null)
+            {
+                recordService.disablePropertyEditableCheck(result.getNodeRef());
+            }
         }
 
         return result;
@@ -52,7 +55,10 @@ public class ExtendedFileFolderServiceImpl extends FileFolderServiceImpl
         finally
         {
             recordService.enablePropertyEditableCheck();
-            recordService.disablePropertyEditableCheck(result.getNodeRef());
+            if (result != null)
+            {
+                recordService.disablePropertyEditableCheck(result.getNodeRef());
+            }
         }
 
         return result;