Merge remote-tracking branch 'upstream/master' into feat/files-api

Author: dignifiedquire

src/request-api.js

@@ -16,9 +16,13 @@ function onEnd (buffer, result, passThrough, cb) {
 
     if (res.statusCode >= 400 || !res.statusCode) {
       var error = new Error(`Server responded with ${res.statuscode}: ${body}`)
-      body = JSON.parse(body)
-      error.code = body.Code
-      error.message = body.Message
+      try {
+        body = JSON.parse(body)
+        error.code = body.Code
+        error.message = body.Message
+      } catch (e) {
+        error.body = body
+      }
       return cb(error)
     }