diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/email/CustomEmailMappingServiceImpl.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/email/CustomEmailMappingServiceImpl.java
index 423a1f8298..ba1c8aab66 100644
--- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/email/CustomEmailMappingServiceImpl.java
+++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/email/CustomEmailMappingServiceImpl.java
@@ -214,11 +214,11 @@ public class CustomEmailMappingServiceImpl extends AbstractLifecycleBean impleme
      */
     public void addCustomMapping(String from, String to)
     {
-        if (StringUtils.isBlank(from) || StringUtils.isBlank(to) || !getEmailMappingKeys().contains(from))
+        if (StringUtils.isBlank(from) || StringUtils.isBlank(to))
         {
-            throw new AlfrescoRuntimeException("Invalid values for from/to.");  
+            throw new AlfrescoRuntimeException("Invalid values for from/to.");
         }
-        
+
         // create custom mapping
         CustomMapping customMapping = new CustomMapping(from, to);
 
@@ -245,6 +245,11 @@ public class CustomEmailMappingServiceImpl extends AbstractLifecycleBean impleme
      */
     public void deleteCustomMapping(String from, String to)
     {
+        if (StringUtils.isBlank(from) || StringUtils.isBlank(to))
+        {
+            throw new AlfrescoRuntimeException("Invalid values for from/to.");
+        }
+
         // create custom mapping
         CustomMapping customMapping = new CustomMapping(from, to);
 
diff --git a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/CustomEMailMappingServiceImplTest.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/CustomEMailMappingServiceImplTest.java
index b3f7fd180d..ab91930b25 100644
--- a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/CustomEMailMappingServiceImplTest.java
+++ b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/CustomEMailMappingServiceImplTest.java
@@ -65,7 +65,7 @@ public class CustomEMailMappingServiceImplTest extends BaseRMTestCase
                 assertTrue(checkCustomMappingsSize(20));
 
                 String firstKey = eMailMappingService.getEmailMappingKeys().get(0);
-                
+
                 // Add a custom mapping
                 eMailMappingService.addCustomMapping(firstKey, "cm:monkeyFace");
 
@@ -90,7 +90,7 @@ public class CustomEMailMappingServiceImplTest extends BaseRMTestCase
                 // Check the email mapping keys size
                 // There are 6 "standard" EmailMappingKeys + 2 CustomEmailMappingKeys are added on setUp
                 assertTrue(checkEmailMappingKeysSize(8));
-                
+
                 try
                 {
                     eMailMappingService.addCustomMapping(" ", "cm:monkeyFace");
@@ -114,18 +114,7 @@ public class CustomEMailMappingServiceImplTest extends BaseRMTestCase
                 }
 
                 eMailMappingService.addCustomMapping(firstKey, "cm:monkeyFace"); //valid key
-                
-                try
-                {
 
-                    eMailMappingService.addCustomMapping(firstKey+"invalid", "cm:monkeyFace");//invalid key
-                    fail("Should not get here. Invalid data.");
-                }
-                catch (AlfrescoRuntimeException are)
-                {
-                    assertNotNull(are);  //Must throw this exception
-                    assertTrue(are.getMessage().contains("Invalid values for"));
-                }
                 return null;
             }
         }, rmAdminName);