--- a/client/src/api/APIClient.js	Fri Jun 23 15:57:35 2017 +0200
+++ b/client/src/api/APIClient.js	Fri Jun 23 17:58:21 2017 +0200
@@ -68,7 +68,14 @@
       fetch(req)
         .then((response) => {
           if (response.ok) {
-            return response.json().then((data) => resolve(data));
+            let resJsonPromise;
+            if(response.status === 204) {
+              resJsonPromise = Promise.resolve({});
+            } else {
+              resJsonPromise = response.json();
+            }
+            return resJsonPromise.then((data) => resolve(data));
+
           } else {
             return response.json().then((data) => reject(data));
           }