diff --git a/docs/client/errors.go b/docs/client/errors.go
index 043782bfb..00fafe117 100644
--- a/docs/client/errors.go
+++ b/docs/client/errors.go
@@ -28,12 +28,13 @@ func (e *UnexpectedHTTPStatusError) Error() string {
 // UnexpectedHTTPResponseError is returned when an expected HTTP status code
 // is returned, but the content was unexpected and failed to be parsed.
 type UnexpectedHTTPResponseError struct {
-	ParseErr error
-	Response []byte
+	ParseErr   error
+	StatusCode int
+	Response   []byte
 }
 
 func (e *UnexpectedHTTPResponseError) Error() string {
-	return fmt.Sprintf("error parsing HTTP response: %s: %q", e.ParseErr.Error(), string(e.Response))
+	return fmt.Sprintf("error parsing HTTP %d response body: %s: %q", e.StatusCode, e.ParseErr.Error(), string(e.Response))
 }
 
 func parseHTTPErrorResponse(statusCode int, r io.Reader) error {
@@ -58,8 +59,9 @@ func parseHTTPErrorResponse(statusCode int, r io.Reader) error {
 
 	if err := json.Unmarshal(body, &errors); err != nil {
 		return &UnexpectedHTTPResponseError{
-			ParseErr: err,
-			Response: body,
+			ParseErr:   err,
+			StatusCode: statusCode,
+			Response:   body,
 		}
 	}
 
@@ -67,8 +69,9 @@ func parseHTTPErrorResponse(statusCode int, r io.Reader) error {
 		// If there was no error specified in the body, return
 		// UnexpectedHTTPResponseError.
 		return &UnexpectedHTTPResponseError{
-			ParseErr: ErrNoErrorsInBody,
-			Response: body,
+			ParseErr:   ErrNoErrorsInBody,
+			StatusCode: statusCode,
+			Response:   body,
 		}
 	}
 
diff --git a/docs/client/errors_test.go b/docs/client/errors_test.go
index 1d60cd2da..ca9dddd10 100644
--- a/docs/client/errors_test.go
+++ b/docs/client/errors_test.go
@@ -68,7 +68,7 @@ func TestHandleErrorResponseExpectedStatusCode404EmptyErrorSlice(t *testing.T) {
 	}
 	err := HandleErrorResponse(response)
 
-	expectedMsg := `error parsing HTTP response: no error details found in HTTP response body: "{\"randomkey\": \"randomvalue\"}"`
+	expectedMsg := `error parsing HTTP 404 response body: no error details found in HTTP response body: "{\"randomkey\": \"randomvalue\"}"`
 	if !strings.Contains(err.Error(), expectedMsg) {
 		t.Errorf("Expected \"%s\", got: \"%s\"", expectedMsg, err.Error())
 	}
@@ -83,7 +83,7 @@ func TestHandleErrorResponseExpectedStatusCode404InvalidBody(t *testing.T) {
 	}
 	err := HandleErrorResponse(response)
 
-	expectedMsg := "error parsing HTTP response: invalid character 'i' looking for beginning of object key string: \"{invalid json}\""
+	expectedMsg := "error parsing HTTP 404 response body: invalid character 'i' looking for beginning of object key string: \"{invalid json}\""
 	if !strings.Contains(err.Error(), expectedMsg) {
 		t.Errorf("Expected \"%s\", got: \"%s\"", expectedMsg, err.Error())
 	}