diff --git a/components/application-mgt/org.wso2.carbon.identity.application.common/src/main/java/org/wso2/carbon/identity/application/common/util/AuthenticatorMgtExceptionBuilder.java b/components/application-mgt/org.wso2.carbon.identity.application.common/src/main/java/org/wso2/carbon/identity/application/common/util/AuthenticatorMgtExceptionBuilder.java
index eb32b47d8d22..49ad1f8d2c9e 100644
--- a/components/application-mgt/org.wso2.carbon.identity.application.common/src/main/java/org/wso2/carbon/identity/application/common/util/AuthenticatorMgtExceptionBuilder.java
+++ b/components/application-mgt/org.wso2.carbon.identity.application.common/src/main/java/org/wso2/carbon/identity/application/common/util/AuthenticatorMgtExceptionBuilder.java
@@ -80,15 +80,17 @@ public static AuthenticatorMgtServerRuntimeException buildRuntimeServerException
     public enum AuthenticatorMgtError {
 
         // Client errors.
-        ERROR_NOT_FOUND_AUTHENTICATOR("60001", "No Authenticator found.",
+        ERROR_NOT_FOUND_AUTHENTICATOR("60010", "No Authenticator found.",
                 "No Authenticator found by given authenticator name: %s."),
-        ERROR_OPERATION_ALLOWED_FOR_SYSTEM_AUTHENTICATOR("60002", "No operations allowed on system " +
-                "authenticators.", "Do not allow to perform any operation on system defined authenticator: %s."),
-        ERROR_AUTHENTICATOR_ALREADY_EXIST("60003", "The authenticator already exists.",
+        ERROR_CODE_INVALID_ENDPOINT_CONFIG("60011", "Invalid endpoint configuration provided.",
+                "Invalid endpoint configuration is provided for the authenticator %s."),
+        ERROR_CODE_ERROR_AUTHENTICATOR_NOT_FOUND("60012", "Authenticator not found.",
+                "Authenticator not found by the given name: %s."),
+        ERROR_AUTHENTICATOR_ALREADY_EXIST("60013", "The authenticator already exists.",
                 "The authenticator already exists for the given name: %s."),
-        ERROR_INVALID_AUTHENTICATOR_NAME("60004", "Authenticator name is invalid.",
+        ERROR_INVALID_AUTHENTICATOR_NAME("60014", "Authenticator name is invalid.",
                 "The provided authenticator name %s is not in the expected format %s."),
-        ERROR_BLANK_FIELD_VALUE("60004", "Invalid empty or blank value.",
+        ERROR_BLANK_FIELD_VALUE("60015", "Invalid empty or blank value.",
                 "Value for %s should not be empty or blank."),
 
         // Server errors.
diff --git a/components/application-mgt/org.wso2.carbon.identity.application.common/src/main/java/org/wso2/carbon/identity/application/common/util/UserDefinedAuthenticatorEndpointConfigManager.java b/components/application-mgt/org.wso2.carbon.identity.application.common/src/main/java/org/wso2/carbon/identity/application/common/util/UserDefinedAuthenticatorEndpointConfigManager.java
index 50d304aa53b6..9beb0183ec13 100644
--- a/components/application-mgt/org.wso2.carbon.identity.application.common/src/main/java/org/wso2/carbon/identity/application/common/util/UserDefinedAuthenticatorEndpointConfigManager.java
+++ b/components/application-mgt/org.wso2.carbon.identity.application.common/src/main/java/org/wso2/carbon/identity/application/common/util/UserDefinedAuthenticatorEndpointConfigManager.java
@@ -198,7 +198,7 @@ private static AuthenticatorMgtException handleActionMgtException(AuthenticatorM
         if (actionException instanceof ActionMgtClientException) {
             ActionMgtClientException error = (ActionMgtClientException) actionException;
             throw new AuthenticatorMgtClientException(
-                    authenticatorMgtError.getCode(), error.getMessage(), error.getDescription());
+                    authenticatorMgtError.getCode(), authenticatorMgtError.getMessage(), error.getDescription());
         }
 
         throw buildServerException(authenticatorMgtError, data);