Merge "Add more information for InvalidCredentials exception"