diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/audit/extractor/AuthenticatedUserRolesDataExtractor.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/audit/extractor/AuthenticatedUserRolesDataExtractor.java
index a1ff86aa76..c01411aa73 100644
--- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/audit/extractor/AuthenticatedUserRolesDataExtractor.java
+++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/audit/extractor/AuthenticatedUserRolesDataExtractor.java
@@ -94,18 +94,22 @@ public final class AuthenticatedUserRolesDataExtractor extends AbstractDataExtra
             return null;
         }
 
+        StringBuilder sb = new StringBuilder(100);
+        
         // Get the rm root
         NodeRef rmRootNodeRef = filePlanService.getFilePlan(nodeRef);
 
-        Set<Role> roles = filePlanRoleService.getRolesByUser(rmRootNodeRef, user);
-        StringBuilder sb = new StringBuilder(100);
-        for (Role role : roles)
+        if (rmRootNodeRef != null)
         {
-            if (sb.length() > 0)
+            Set<Role> roles = filePlanRoleService.getRolesByUser(rmRootNodeRef, user);
+            for (Role role : roles)
             {
-                sb.append(", ");
+                if (sb.length() > 0)
+                {
+                    sb.append(", ");
+                }
+                sb.append(role.getDisplayLabel());
             }
-            sb.append(role.getDisplayLabel());
         }
 
         // Done
diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/audit/extractor/FilePlanNamePathDataExtractor.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/audit/extractor/FilePlanNamePathDataExtractor.java
index be516fc41d..4e267aa55a 100644
--- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/audit/extractor/FilePlanNamePathDataExtractor.java
+++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/audit/extractor/FilePlanNamePathDataExtractor.java
@@ -93,15 +93,18 @@ public final class FilePlanNamePathDataExtractor extends AbstractDataExtractor
         try
         {
             NodeRef nodeRef = (NodeRef) value;
-
-            // Get path from the RM root
-            List<NodeRef> nodeRefPath = filePlanService.getNodeRefPath(nodeRef);
-
             StringBuilder sb = new StringBuilder(128);
-            for (NodeRef pathNodeRef : nodeRefPath)
+            
+            if (nodeService.hasAspect(nodeRef, RecordsManagementModel.ASPECT_FILE_PLAN_COMPONENT))
             {
-                String name = (String)nodeService.getProperty(pathNodeRef, ContentModel.PROP_NAME);
-                sb.append("/").append(name);
+                // Get path from the RM root
+                List<NodeRef> nodeRefPath = filePlanService.getNodeRefPath(nodeRef);
+    
+                for (NodeRef pathNodeRef : nodeRefPath)
+                {
+                    String name = (String)nodeService.getProperty(pathNodeRef, ContentModel.PROP_NAME);
+                    sb.append("/").append(name);
+                }
             }
 
             // Done
diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/fileplan/FilePlanServiceImpl.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/fileplan/FilePlanServiceImpl.java
index e42b3131b4..1ee0aca906 100644
--- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/fileplan/FilePlanServiceImpl.java
+++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/fileplan/FilePlanServiceImpl.java
@@ -467,7 +467,7 @@ public class FilePlanServiceImpl extends ServiceBaseImpl
         // Prepend it to the path
         nodeRefPath.addFirst(nodeRef);
         // Are we not at the root
-        if (!isFilePlan(nodeRef))
+        if (!isFilePlan(nodeRef) && isFilePlanComponent(nodeRef))
         {
             ChildAssociationRef assocRef = nodeService.getPrimaryParent(nodeRef);
             if (assocRef == null)