diff --git a/src/backend/InvenTree/InvenTree/version.py b/src/backend/InvenTree/InvenTree/version.py
index a3c110bf4c..8752f4e6a7 100644
--- a/src/backend/InvenTree/InvenTree/version.py
+++ b/src/backend/InvenTree/InvenTree/version.py
@@ -3,6 +3,7 @@
 Provides information on the current InvenTree version
 """
 
+import logging
 import os
 import pathlib
 import platform
@@ -14,20 +15,29 @@ from datetime import timedelta as td
 import django
 from django.conf import settings
 
-from dulwich.repo import NotGitRepository, Repo
-
-from common.settings import get_global_setting
-
 from .api_version import INVENTREE_API_TEXT, INVENTREE_API_VERSION
 
 # InvenTree software version
 INVENTREE_SW_VERSION = '0.16.0 dev'
 
+
+logger = logging.getLogger('inventree')
+
+
 # Discover git
 try:
+    from dulwich.repo import Repo
+
     main_repo = Repo(pathlib.Path(__file__).parent.parent.parent.parent.parent)
     main_commit = main_repo[main_repo.head()]
-except (NotGitRepository, FileNotFoundError):
+except (ImportError, ModuleNotFoundError):
+    logger.warning(
+        'Warning: Dulwich module not found, git information will not be available.'
+    )
+    main_repo = None
+    main_commit = None
+except Exception:
+    main_repo = None
     main_commit = None
 
 
@@ -53,11 +63,15 @@ def checkMinPythonVersion():
 
 def inventreeInstanceName():
     """Returns the InstanceName settings for the current database."""
+    from common.settings import get_global_setting
+
     return get_global_setting('INVENTREE_INSTANCE')
 
 
 def inventreeInstanceTitle():
     """Returns the InstanceTitle for the current database."""
+    from common.settings import get_global_setting
+
     if get_global_setting('INVENTREE_INSTANCE_TITLE'):
         return get_global_setting('INVENTREE_INSTANCE')
 
@@ -121,6 +135,8 @@ def isInvenTreeUpToDate():
 
     A background task periodically queries GitHub for latest version, and stores it to the database as "_INVENTREE_LATEST_VERSION"
     """
+    from common.settings import get_global_setting
+
     latest = get_global_setting(
         '_INVENTREE_LATEST_VERSION', backup_value=None, create=False
     )
diff --git a/tasks.py b/tasks.py
index 2053ddfd9c..df7e456d2f 100644
--- a/tasks.py
+++ b/tasks.py
@@ -1069,8 +1069,8 @@ API         {InvenTreeVersion.inventreeApiVersion()}
 Node        {node if node else 'N/A'}
 Yarn        {yarn if yarn else 'N/A'}
 
-Commit hash:{InvenTreeVersion.inventreeCommitHash()}
-Commit date:{InvenTreeVersion.inventreeCommitDate()}"""
+Commit hash: {InvenTreeVersion.inventreeCommitHash()}
+Commit date: {InvenTreeVersion.inventreeCommitDate()}"""
     )
     if len(sys.argv) == 1 and sys.argv[0].startswith('/opt/inventree/env/lib/python'):
         print(