2 files changed, 8 insertions, 5 deletions
diff --git a/packages/connect/CHANGELOG.md b/packages/connect/CHANGELOG.md
index 35e78c18c..8b88c3d20 100644
--- a/packages/connect/CHANGELOG.md
+++ b/packages/connect/CHANGELOG.md
@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## v0.6.1 - _TBD, 2018_
+
+    * Fix JSON parse empty response (#407)
+
 ## v0.6.0 - _February 16, 2018_
 
     * Add pagination options to HttpClient methods (#393)
diff --git a/packages/connect/src/http_client.ts b/packages/connect/src/http_client.ts
index 9e5f0f448..cf0aaef0d 100644
--- a/packages/connect/src/http_client.ts
+++ b/packages/connect/src/http_client.ts
@@ -172,13 +172,12 @@ export class HttpClient implements Client {
             body: JSON.stringify(payload),
             headers,
         });
-        const json = await response.json();
+        const text = await response.text();
         if (!response.ok) {
-            const errorString = `${response.status} - ${response.statusText}\n${requestType} ${url}\n${JSON.stringify(
-                json,
-            )}`;
+            const errorString = `${response.status} - ${response.statusText}\n${requestType} ${url}\n${text}`;
             throw Error(errorString);
         }
-        return json;
+        const result = !_.isEmpty(text) ? JSON.parse(text) : undefined;
+        return result;
     }
 }