NETID-482 and revise the error message
NETID-482 and revise the error message

UWIT-IAM/iam-idbase,UWIT-IAM/iam-idbase,UWIT-IAM/iam-idbase,jeffFranklin/iam-idbase,jeffFranklin/iam-idbase,jeffFranklin/iam-idbase