Get rid of ClientError and AuthenticationError