CORE-5559: Correction to auth error handling