Continuing to change everything to use HttpErrors