Fix to use server error handling