Better error message capture

I'm not sure if I should catch more than just this. In the event of a ValueError (assuming bad JSON) we revert to the original error parsing scheme which was none - just take the whole response from the server