Updated exception handling in Authenticator