Fix to user server error handling