diff --git a/ubersmith/api.py b/ubersmith/api.py
index 5e9acf0..9e56177 100644
--- a/ubersmith/api.py
+++ b/ubersmith/api.py
@@ -268,6 +268,13 @@ def process_request(self, method, data=None):
 
         resp = BaseResponse(response)
 
+        if not str(response.status_code).startswith('2'):
+            error = '\nSTATUS CODE: {}\nCONTENT: {}'.format(
+                response.status_code,
+                str(response.content)
+            )
+            raise ResponseError(error)
+
         # test for error in json response
         if response.headers.get('content-type') == 'application/json':
             if not resp.json.get('status'):
@@ -284,7 +291,7 @@ def process_request(self, method, data=None):
     @staticmethod
     def _is_token_response(response):
         return ('text/html' in response.headers.get('content-type', '') and
-                'Updating Token' in response.content)
+                'Updating Token' in str(response.content))
 
     def _send_request(self, method, data):
         url = append_qs(self.base_url, {'method': method})