diff --git a/source/java/org/alfresco/repo/jscript/People.java b/source/java/org/alfresco/repo/jscript/People.java
index a04d09d761..954ad2fa2f 100644
--- a/source/java/org/alfresco/repo/jscript/People.java
+++ b/source/java/org/alfresco/repo/jscript/People.java
@@ -256,8 +256,8 @@ public final class People extends BaseScopableProcessorExtension
             }
             
             person = createPerson(userName, firstName, lastName, emailAddress);
-    		
-    		if (password != null)
+            
+    		if (person != null && password != null)
     		{   			
     			// create account for person with the userName and password
     			mutableAuthenticationDao.createUser(userName, password.toCharArray());