Merge "Pass json object when invoking exception handler."

1 files changed, 10 insertions, 10 deletions

diff --git a/keystoneclient/client.py b/keystoneclient/client.py
index b9d4bc7..e3c2ed5 100644
--- a/keystoneclient/client.py
+++ b/keystoneclient/client.py
@@ -364,19 +364,10 @@ class HTTPClient(object):
 
         self.http_log_resp(resp)
 
-        if resp.status_code >= 400:
-            _logger.debug(
-                "Request returned failure status: %s",
-                resp.status_code)
-            raise exceptions.from_response(resp, resp.text)
-        elif resp.status_code in (301, 302, 305):
-            # Redirected. Reissue the request to the new location.
-            return self.request(resp.headers['location'], method, **kwargs)
-
         if resp.text:
             try:
                 body = json.loads(resp.text)
-            except ValueError:
+            except (ValueError, TypeError):
                 body = None
                 _logger.debug("Could not decode JSON from body: %s"
                               % resp.text)
@@ -384,6 +375,15 @@ class HTTPClient(object):
             _logger.debug("No body was returned.")
             body = None
 
+        if resp.status_code >= 400:
+            _logger.debug(
+                "Request returned failure status: %s",
+                resp.status_code)
+            raise exceptions.from_response(resp, body or resp.text)
+        elif resp.status_code in (301, 302, 305):
+            # Redirected. Reissue the request to the new location.
+            return self.request(resp.headers['location'], method, **kwargs)
+
         return resp, body
 
     def _cs_request(self, url, method, **kwargs):