--- a/client/src/APIClient.js	Mon Jun 19 12:39:00 2017 +0200
+++ b/client/src/APIClient.js	Mon Jun 19 14:35:48 2017 +0200
@@ -21,10 +21,16 @@
     return new Request(this.baseURL + uri, options);
   }
 
+  hasToken = () => {
+    const token = this.localStorage.get('token');
+
+    return token !== null;
+  }
+
   createAuthorizedRequest = (method, uri, data) => {
 
     var headers = new Headers(),
-        token = this.storage.get('token') || '';
+        token = this.localStorage.get('token') || '';
     headers.append("Authorization", "Bearer " + token);
     headers.append("Content-Type", "application/json");
 
@@ -33,7 +39,7 @@
 
   request = (method, uri, data) => {
     console.log(method + ' ' + uri);
-    var req = this.model ? this.createAuthorizedRequest(method, uri, data) : this.createRequest(method, uri, data);
+    var req = this.hasToken() ? this.createAuthorizedRequest(method, uri, data) : this.createRequest(method, uri, data);
     return this.fetch(req, { credentials: 'include' });
   }