--- a/client/src/lib/session.js	Wed Sep 18 10:37:54 2019 +0200
+++ b/client/src/lib/session.js	Wed Sep 18 11:32:29 2019 +0200
@@ -18,25 +18,27 @@
 import { displayError } from "@/lib/errors";
 
 const logOff = () => {
+  const hasToken = localStorage.getItem("token");
+  if (!hasToken) return;
   HTTP.get("/logout", {
     headers: {
       "X-Gemma-Auth": localStorage.getItem("token"),
       "Content-type": "text/xml; charset=UTF-8"
     }
   })
-    .then(() => {
-      app.$snotify.clear();
-      app.$store.commit("reset");
-      app.$store.commit("user/clearAuth");
-      app.$router.push("/login");
-      unsetLayerConfigs();
-    })
     .catch(error => {
       const { status, data } = error.response;
       displayError({
         title: this.$gettext("Backend Error"),
         message: `${status}: ${data.message || data}`
       });
+    })
+    .finally(() => {
+      app.$snotify.clear();
+      app.$store.commit("reset");
+      app.$store.commit("user/clearAuth");
+      app.$router.push("/login");
+      unsetLayerConfigs();
     });
 };