diff --git a/src/main/java/org/alfresco/repo/security/authority/AuthorityDAOImpl.java b/src/main/java/org/alfresco/repo/security/authority/AuthorityDAOImpl.java
index 5c7e46457e..3352a2aab1 100644
--- a/src/main/java/org/alfresco/repo/security/authority/AuthorityDAOImpl.java
+++ b/src/main/java/org/alfresco/repo/security/authority/AuthorityDAOImpl.java
@@ -1670,7 +1670,7 @@ public class AuthorityDAOImpl implements AuthorityDAO, NodeServicePolicies.Befor
             {
                 if (authorityName.indexOf(illegalCharacter) != -1)
                 {
-                    throw new AlfrescoRuntimeException("Group name contains characters that are not permitted: "+authorityName.charAt(authorityName.indexOf(illegalCharacter)));
+                    throw new AuthorityException("Group name contains characters that are not permitted: "+authorityName.charAt(authorityName.indexOf(illegalCharacter)));
                 }
             }
         }
diff --git a/src/main/java/org/alfresco/repo/security/person/PersonServiceImpl.java b/src/main/java/org/alfresco/repo/security/person/PersonServiceImpl.java
index 5d2cdf184d..e21b355d58 100644
--- a/src/main/java/org/alfresco/repo/security/person/PersonServiceImpl.java
+++ b/src/main/java/org/alfresco/repo/security/person/PersonServiceImpl.java
@@ -1797,7 +1797,7 @@ public class PersonServiceImpl extends TransactionListenerAdapter implements Per
                 {
                     if (userName.indexOf(illegalCharacter) != -1)
                     {
-                        throw new AlfrescoRuntimeException("Person name contains characters that are not permitted: "+userName.charAt(userName.indexOf(illegalCharacter)));
+                        throw new PersonException("Person name contains characters that are not permitted: "+userName.charAt(userName.indexOf(illegalCharacter)));
                     }
                 }
             }
diff --git a/src/test/java/org/alfresco/repo/security/authority/AuthorityServiceTest.java b/src/test/java/org/alfresco/repo/security/authority/AuthorityServiceTest.java
index f80e767c8d..b68aa717a9 100644
--- a/src/test/java/org/alfresco/repo/security/authority/AuthorityServiceTest.java
+++ b/src/test/java/org/alfresco/repo/security/authority/AuthorityServiceTest.java
@@ -261,9 +261,9 @@ public class AuthorityServiceTest extends TestCase
             try 
             {
                 authorityService.createAuthority(AuthorityType.GROUP, groupName);
-                fail("AlfrescoRuntimeException not caught for illegalCharacter: " +groupName.charAt(groupName.indexOf(illegalCharacter)));
+                fail("AuthorityException not caught for illegalCharacter: " +groupName.charAt(groupName.indexOf(illegalCharacter)));
             } 
-            catch (AlfrescoRuntimeException ignored)
+            catch (AuthorityException ignored)
             {
                 // Expected
             }
diff --git a/src/test/java/org/alfresco/repo/security/person/PersonTest.java b/src/test/java/org/alfresco/repo/security/person/PersonTest.java
index dd6ff4238e..230ab02df8 100644
--- a/src/test/java/org/alfresco/repo/security/person/PersonTest.java
+++ b/src/test/java/org/alfresco/repo/security/person/PersonTest.java
@@ -467,9 +467,9 @@ public class PersonTest extends TestCase
             try
             {
                 personService.createPerson(createDefaultProperties(personName, "Some", "User", "some.user@example.com", "alfresco", rootNodeRef));
-                fail("AlfrescoRuntimeException not caught for illegalCharacter: " +personName.charAt(personName.indexOf(illegalCharacter)));
+                fail("PersonException not caught for illegalCharacter: " +personName.charAt(personName.indexOf(illegalCharacter)));
             }
-            catch (AlfrescoRuntimeException ignored)
+            catch (PersonException ignored)
             {
                 // Expected
             }