Merge "Use InvalidCredentials exception from correct path"