diff --git a/app/classes/shared/helpers.py b/app/classes/shared/helpers.py
index dfacd362..9e0ab392 100644
--- a/app/classes/shared/helpers.py
+++ b/app/classes/shared/helpers.py
@@ -516,12 +516,15 @@ class Helpers:
                 full_path = os.path.join(path, file)
                 source_size += os.stat(full_path).st_size
                 files_count += 1
-        dest_size = os.path.getsize(str(dest_path))
-        percent = round((dest_size / source_size) * 100, 1)
+        try:
+            dest_size = os.path.getsize(str(dest_path))
+            percent = round((dest_size / source_size) * 100, 1)
+        except:
+            percent = 0
         if percent >= 0:
             results = {"percent": percent, "total_files": files_count}
         else:
-            results = {"percent": 0, "total_files": 0}
+            results = {"percent": 0, "total_files": files_count}
         return results
 
     @staticmethod
diff --git a/app/classes/shared/main_controller.py b/app/classes/shared/main_controller.py
index d59984e3..efcfabf5 100644
--- a/app/classes/shared/main_controller.py
+++ b/app/classes/shared/main_controller.py
@@ -234,9 +234,8 @@ class Controller:
         self.users.stop_prepare(exec_user["user_id"])
         self.support_scheduler.remove_job("logs_" + str(exec_user["user_id"]))
 
-    @staticmethod
-    def add_system_user():
-        HelperUsers.add_user(
+    def add_system_user(self):
+        self.users_helper.add_user(
             "system",
             Helpers.random_string_generator(64),
             "default@example.com",
diff --git a/app/classes/shared/main_models.py b/app/classes/shared/main_models.py
index 1a0ef46a..19699395 100644
--- a/app/classes/shared/main_models.py
+++ b/app/classes/shared/main_models.py
@@ -2,6 +2,7 @@ import logging
 from playhouse.shortcuts import model_to_dict
 
 from app.classes.shared.helpers import Helpers  # pylint: disable=unused-import
+from app.classes.shared.console import Console
 
 logger = logging.getLogger(__name__)
 
@@ -14,7 +15,7 @@ class DatabaseBuilder:
 
     def default_settings(self):
         logger.info("Fresh Install Detected - Creating Default Settings")
-        self.helper.console.info("Fresh Install Detected - Creating Default Settings")
+        Console.info("Fresh Install Detected - Creating Default Settings")
         default_data = self.helper.find_default_password()
 
         username = default_data.get("username", "admin")
diff --git a/app/classes/web/public_handler.py b/app/classes/web/public_handler.py
index f4455fca..d245fc1d 100644
--- a/app/classes/web/public_handler.py
+++ b/app/classes/web/public_handler.py
@@ -32,14 +32,18 @@ class PublicHandler(BaseHandler):
 
         error = bleach.clean(self.get_argument("error", "Invalid Login!"))
         error_msg = bleach.clean(self.get_argument("error_msg", ""))
-
-        page_data = {
-            "version": self.helper.get_version_string(),
-            "error": error,
-            "lang": self.helper.get_setting("language"),
-            "lang_page": self.helper.get_lang_page(self.helper.get_setting("language")),
-            "query": "",
-        }
+        try:
+            page_data = {
+                "version": self.helper.get_version_string(),
+                "error": error,
+                "lang": self.helper.get_setting("language"),
+                "lang_page": self.helper.get_lang_page(
+                    self.helper.get_setting("language")
+                ),
+                "query": "",
+            }
+        except:
+            self.redirect("/public/login.html")
         if self.request.query:
             page_data["query"] = self.request.query