PierreF
diff --git a/‎influxdb/client.py
Copy file name to clipboardExpand all lines: influxdb/client.py
+6-2Lines changed: 6 additions & 2 deletions b/‎influxdb/client.py
Copy file name to clipboardExpand all lines: influxdb/client.py
+6-2Lines changed: 6 additions & 2 deletions
@@ -202,8 +202,10 @@ def request(self, url, method='GET', params=None, data=None,
         :type expected_response_code: int
         :returns: the response from the request
         :rtype: :class:`requests.Response`
+        :raises InfluxDBServerError: if the response code is any server error
+            code (5xx)
         :raises InfluxDBClientError: if the response code is not the
-            same as `expected_response_code`
+            same as `expected_response_code` and is not a server error code
         """
         url = "{0}/{1}".format(self._baseurl, url)
 
@@ -237,7 +239,9 @@ def request(self, url, method='GET', params=None, data=None,
                 else:
                     raise e
 
-        if response.status_code == expected_response_code:
+        if response.status_code >= 500 and response.status_code < 600:
+            raise InfluxDBServerError(response.content)
+        elif response.status_code == expected_response_code:
             return response
         else:
             raise InfluxDBClientError(response.content, response.status_code)