Revert "Rearrange things"

This reverts commit cb4310796aa92a8bbb77098fe914926f011550b2.
Raise errors on all 4xx and 5xx HTTP errors