diff --git a/components/org.wso2.carbon.identity.scim2.common/src/main/java/org/wso2/carbon/identity/scim2/common/impl/SCIMUserManager.java b/components/org.wso2.carbon.identity.scim2.common/src/main/java/org/wso2/carbon/identity/scim2/common/impl/SCIMUserManager.java
index a0830428..402cf235 100644
--- a/components/org.wso2.carbon.identity.scim2.common/src/main/java/org/wso2/carbon/identity/scim2/common/impl/SCIMUserManager.java
+++ b/components/org.wso2.carbon.identity.scim2.common/src/main/java/org/wso2/carbon/identity/scim2/common/impl/SCIMUserManager.java
@@ -534,8 +534,8 @@ public void deleteUser(String userId) throws NotFoundException, CharonException,
             } else if (userStoreDomainFromSP != null &&
                     !(userStoreDomainFromSP
                             .equalsIgnoreCase(coreUser.getUserStoreDomain()))) {
-                throw new CharonException("User :" + maskIfRequired(coreUser.getUsername()) + "is not belong to user " +
-                        "store " + userStoreDomainFromSP + ". Hence user updating fail.");
+                throw new CharonException("User : " + maskIfRequired(coreUser.getUsername()) + " is not belong to " +
+                        "user store " + userStoreDomainFromSP + ". Hence user updating fail.");
             } else {
                 // We assume (since id is unique per user) only one user exists for a given id.
                 userName = coreUser.getUsername();
@@ -1019,7 +1019,7 @@ public User updateUser(User user, Map<String, Boolean> requiredAttributes) throw
                 User oldUser = this.getUser(user.getId(), ResourceManagerUtil.getAllAttributeURIs(schema));
                 if (userStoreDomainFromSP != null && !userStoreDomainFromSP
                         .equalsIgnoreCase(IdentityUtil.extractDomainFromName(oldUser.getUserName()))) {
-                    throw new CharonException("User :" + maskIfRequired(oldUser.getUserName()) + "is not belong to " +
+                    throw new CharonException("User : " + maskIfRequired(oldUser.getUserName()) + " is not belong to " +
                             "user store " + userStoreDomainFromSP + ". Hence user updating fail.");
                 }
                 if (getUserStoreDomainFromSP() != null &&
@@ -1526,7 +1526,7 @@ private String resolveDomainName(String domainName, ExpressionNode node) throws
             domainName = resolveDomainNameInAttributeValue(domainName, node);
         } catch (BadRequestException e) {
             String errorMessage = String.format("Domain parameter: %s in request does not match with the domain " +
-                    "name in the attribute value: %s ", domainName, maskIfRequired(node.getValue()));
+                    "name in the attribute value: %s", domainName, maskIfRequired(node.getValue()));
             throw new CharonException(errorMessage, e);
         }
         // Get domain name according to Filter Enhancements properties as in identity.xml