Cleaned up error handling code. New behaviour for failed requests.
Fixed: call to renamed method not updated