diff --git a/client/index.js b/client/index.js
index c85b6b48..1e215a6f 100644
--- a/client/index.js
+++ b/client/index.js
@@ -21,9 +21,9 @@ import "./assets/css/reset.scss";
                 .then(render);
         }
         return removeLoader().then(render);
-    }).catch((e) => {
-        const msg = navigator.onLine === false ? "OFFLINE" : e.message || "CAN'T LOAD";
-        Log.report(msg + " - " + (e && e.message), location.href);
+    }).catch((err) => {
+        const msg = navigator.onLine === false ? "OFFLINE" : (err.message || "CAN'T LOAD");
+        Log.report(msg + " - " + (err && err.message), location.href);
         return removeLoaderWithAnimation().then(() => {
             $error(msg);
         });
@@ -97,10 +97,7 @@ if ("serviceWorker" in navigator) {
 window.overrides = {};
 function setup_xdg_open() {
     return new Promise((done, err) => {
-        load("/overrides/xdg-open.js", function(error) {
-            if (error) return err(error);
-            done();
-        });
+        load("/overrides/xdg-open.js", () => done());
     });
 }
 
diff --git a/client/model/log.js b/client/model/log.js
index d0aede72..31fecd00 100644
--- a/client/model/log.js
+++ b/client/model/log.js
@@ -31,7 +31,7 @@ class LogManager {
         url += "from.lineNo="+lineNo+"&";
         url += "from.columnNo="+columnNo;
         if (error) url += "error="+encodeURIComponent(error.message)+"&";
-        return http_post(url).catch();
+        return http_post(url).catch(() => {});
     }
 }
 
diff --git a/client/worker/sw_cache.js b/client/worker/sw_cache.js
index eaeb0c6d..0f2a1b01 100644
--- a/client/worker/sw_cache.js
+++ b/client/worker/sw_cache.js
@@ -6,11 +6,11 @@ const CACHE_NAME = "v0.3";
  */
 self.addEventListener("fetch", function(event) {
     if (is_a_ressource(event.request)) {
-        return event.respondWith(cacheFirstStrategy(event));
+        return event.respondWith(cacheFirstStrategy(event).catch((err) => ({ code: "CANNOT_LOAD", message: err.message })));
     } else if (is_an_api_call(event.request)) {
         return event;
     } else if (is_an_index(event.request)) {
-        return event.respondWith(cacheFirstStrategy(event));
+        return event.respondWith(cacheFirstStrategy(event).catch((err) => ({ code: "CANNOT_LOAD", message: err.message })));
     } else {
         return event;
     }