Changes to better handle server errors and faking HTTP requests