Modify handling of err.res

Author: deve-sh

lib/requester/requester.js

@@ -439,22 +439,25 @@ class Requester extends EventEmitter {
             // prepare history from request debug data
             var history = getExecutionHistory(debug),
                 responseTime,
-                response,
-                errorHasUsableResponse = false;
+                response;
 
-            if (err && err.res && err.res.body && Buffer.isBuffer(err.res.body)) {
-                errorHasUsableResponse = true;
-                resBody = err.res.body;
-            }
-
-            if (err && !errorHasUsableResponse) {
+            if (err && !err.res) {
                 // bubble up http errors
                 // @todo - Should we send an empty sdk Response here?
                 //
                 // Sending `history` object even in case of error
                 return onEnd(err, undefined, history);
             }
 
+            // If the error has a response attached, use it to populate the response instead of treating
+            // it as a crash.
+            if (err && err.res) {
+                res = err.res;
+
+                if (Buffer.isBuffer(err.res.body)) {
+                    resBody = err.res.body;
+                }
+            }
 
             // Calculate the time taken for us to get the response.
             responseTime = Date.now() - startTime;