Fix for NullReferenceExceptions in AuthenticationInfo