Try to fix auth error handling