diff --git a/.eslintrc.json b/.eslintrc.json
index 90d9ed31c..b735c1efe 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -8,10 +8,6 @@
         "ecmaVersion": 2020
     },
     "rules": {
-        "indent": [
-            "error",
-            4
-        ],
         "linebreak-style": [
             "error",
             "unix"
diff --git a/filemanager/.jshintrc b/filemanager/.jshintrc
deleted file mode 100644
index c00b8b7a8..000000000
--- a/filemanager/.jshintrc
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-	"node": true,
-	"browser": true,
-	"unused": true,
-	"esversion": 11,
-	"globalstrict": false,
-	"predef": [ "angular", "$", "describe", "it", "before", "after" ]
-}
diff --git a/filemanager/package-lock.json b/filemanager/package-lock.json
index c1dbe6023..6bbc12ec4 100644
--- a/filemanager/package-lock.json
+++ b/filemanager/package-lock.json
@@ -13,7 +13,6 @@
         "pankow": "^0.0.8",
         "primeicons": "^6.0.1",
         "primevue": "^3.26.1",
-        "safetydance": "^2.2.0",
         "superagent": "^8.0.9",
         "vue": "^3.2.47",
         "vue-router": "^4.1.6"
@@ -956,14 +955,6 @@
         "fsevents": "~2.3.2"
       }
     },
-    "node_modules/safetydance": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/safetydance/-/safetydance-2.2.0.tgz",
-      "integrity": "sha512-TzAedqLBi4KLXVYUuFp17HhX2AJJlzFsZqlPWyO5GHFEeqhUo70azU+CiGeFKi8xlbrvHUIz0hSIqw3eQTXidw==",
-      "engines": [
-        "node >= 4.0.0"
-      ]
-    },
     "node_modules/semver": {
       "version": "7.3.8",
       "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
diff --git a/filemanager/package.json b/filemanager/package.json
index 82ec7995d..d4e9ff4d8 100644
--- a/filemanager/package.json
+++ b/filemanager/package.json
@@ -14,7 +14,6 @@
     "pankow": "^0.0.8",
     "primeicons": "^6.0.1",
     "primevue": "^3.26.1",
-    "safetydance": "^2.2.0",
     "superagent": "^8.0.9",
     "vue": "^3.2.47",
     "vue-router": "^4.1.6"
diff --git a/filemanager/src/App.vue b/filemanager/src/App.vue
index 92c902c0b..89a651b3c 100644
--- a/filemanager/src/App.vue
+++ b/filemanager/src/App.vue
@@ -11,11 +11,13 @@ export default {
   components: { ConfirmDialog },
   data() {
     return {
-      accessToken: localStorage.token || ''
     };
   },
   mounted() {
-    if (!this.accessToken) window.location.href = '/';
+    if (!localStorage.token) {
+      if (import.meta.env.BASE_URL !== '/') window.location.href = '/';
+      else console.error('Set localStorage.token')
+    }
   }
 };
 
diff --git a/filemanager/src/models/DirectoryModel.js b/filemanager/src/models/DirectoryModel.js
index 8c943ca0c..3e496ee30 100644
--- a/filemanager/src/models/DirectoryModel.js
+++ b/filemanager/src/models/DirectoryModel.js
@@ -1,6 +1,5 @@
 
 import superagent from 'superagent';
-import safe from 'safetydance';
 import { sanitize } from 'pankow/utils';
 
 export function createDirectoryModel(origin, accessToken, api) {
@@ -8,9 +7,15 @@ export function createDirectoryModel(origin, accessToken, api) {
   return {
     name: 'DirectoryModel',
     async listFiles(path) {
-      const [error, result] = await safe(superagent.get(`${origin}/api/v1/${api}/files/${path}`).query({ access_token: accessToken }));
-      if (error) {
-        console.error('Failed to list files', error);
+      let error, result;
+      try {
+        result = await superagent.get(`${origin}/api/v1/${api}/files/${path}`).query({ access_token: accessToken });
+      } catch (e) {
+        error = e;
+      }
+
+      if (error || result.statusCode !== 200) {
+        console.error('Failed to list files', error || result.statusCode);
         return [];
       }
 
@@ -18,7 +23,7 @@ export function createDirectoryModel(origin, accessToken, api) {
       result.body.entries.forEach(item => {
         // if we have an image, attach previewUrl
         if (item.mimeType.indexOf('image/') === 0) {
-          item.previewUrl = `${origin}/api/v1/${api}/files/${encodeURIComponent(path + '/' + item.fileName)}?access_token=${accessToken}`
+          item.previewUrl = `${origin}/api/v1/${api}/files/${encodeURIComponent(path + '/' + item.fileName)}?access_token=${accessToken}`;
         }
 
         item.folderPath = path;
@@ -59,8 +64,10 @@ export function createDirectoryModel(origin, accessToken, api) {
         .field('overwrite', 'true');
     },
     async getFile(path) {
-      const [error, result] = await safe(fetch(`${origin}/api/v1/${api}/files/${path}?access_token=${accessToken}`));
-      if (error) {
+      let result;
+      try {
+        result = await fetch(`${origin}/api/v1/${api}/files/${path}?access_token=${accessToken}`);
+      } catch (error) {
         console.error('Failed to get file', error);
         return null;
       }
diff --git a/filemanager/src/views/Home.vue b/filemanager/src/views/Home.vue
index 1f7470608..b682c271e 100644
--- a/filemanager/src/views/Home.vue
+++ b/filemanager/src/views/Home.vue
@@ -72,7 +72,6 @@
 
 <script>
 
-import safe from 'safetydance';
 import superagent from 'superagent';
 
 import Button from 'primevue/button';
@@ -291,9 +290,15 @@ export default {
     useConfirm();
 
     // load all apps
-    let [error, result] = await safe(superagent.get(`${this.apiOrigin}/api/v1/apps`).query({ access_token: this.accessToken }));
-    if (error) {
-      console.error('Failed to list apps', error);
+    let error, result;
+    try {
+      result = await superagent.get(`${this.apiOrigin}/api/v1/apps`).query({ access_token: this.accessToken });
+    } catch (e) {
+      error = e;
+    }
+
+    if (error || result.statusCode !== 200) {
+      console.error('Failed to list apps', error || result.statusCode);
       this.apps = [];
     } else {
       this.apps = result.body ? result.body.apps.filter(a => !!a.manifest.addons.localstorage) : [];
@@ -301,9 +306,14 @@ export default {
     this.apps.forEach(function (a) { a.type = 'app'; a.label = a.fqdn; });
 
     // load all volumes
-    [error, result] = await safe(superagent.get(`${this.apiOrigin}/api/v1/volumes`).query({ access_token: this.accessToken }));
-    if (error) {
-      console.error('Failed to list volumes', error);
+    try {
+      result = await superagent.get(`${this.apiOrigin}/api/v1/volumes`).query({ access_token: this.accessToken });
+    } catch (e) {
+      error = e;
+    }
+
+    if (error || result.statusCode !== 200) {
+      console.error('Failed to list volumes', error || result.statusCode);
       this.volumes = [];
     } else {
       this.volumes = result.body ? result.body.volumes : [];
@@ -335,6 +345,11 @@ export default {
       this.activeResource = this.apps[0];
     }
 
+    if (!this.activeResource) {
+      console.error('Not able to load apps or volumes. Cannot continue');
+      return;
+    }
+
     this.cwd = sanitize('/' + (this.$route.params.cwd ? this.$route.params.cwd.join('/') : '/'));
 
     this.loadResource(this.activeResource);