diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/audit/RecordsManagementAuditServiceImpl.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/audit/RecordsManagementAuditServiceImpl.java
index 821c609f85..e238562ecf 100644
--- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/audit/RecordsManagementAuditServiceImpl.java
+++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/audit/RecordsManagementAuditServiceImpl.java
@@ -1446,7 +1446,11 @@ public class RecordsManagementAuditServiceImpl extends AbstractLifecycleBean
                 if (entry.getEvent().equals("Create Person") && entry.getNodeRef() != null)
                 {
                     NodeRef nodeRef = entry.getNodeRef();
-                    String userName = (String)nodeService.getProperty(nodeRef, ContentModel.PROP_USERNAME);
+                    String userName = null;
+                    if(nodeService.exists(nodeRef))
+                    {
+                        userName = (String)nodeService.getProperty(nodeRef, ContentModel.PROP_USERNAME);
+                    }
                     json.put("nodeName", userName == null ? "": userName);
                     json.put("createPerson", true);
                 }
diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/AuditLogGet.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/AuditLogGet.java
index 7333d692c9..aac1f0298a 100644
--- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/AuditLogGet.java
+++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/AuditLogGet.java
@@ -158,6 +158,10 @@ public class AuditLogGet extends BaseAuditRetrievalWebScript
         if( targetNode == null )
         {
             targetNode = filePlanService.getFilePlanBySiteId(FilePlanService.DEFAULT_RM_SITE_ID);
+            if(targetNode == null)
+            {
+                throw new WebScriptException(Status.STATUS_NOT_FOUND, "The default RM site was not found");
+            }
         }
         return AccessStatus.ALLOWED.equals(
                 capabilityService.getCapabilityAccessState(targetNode, ACCESS_AUDIT_CAPABILITY));