diff --git a/evennia/contrib/utils/git_integration/git_integration.py b/evennia/contrib/utils/git_integration/git_integration.py
index 1686c268f8..3cbde3f00b 100644
--- a/evennia/contrib/utils/git_integration/git_integration.py
+++ b/evennia/contrib/utils/git_integration/git_integration.py
@@ -1,3 +1,4 @@
+from resource import error
 from django.conf import settings
 from evennia import CmdSet, InterruptCommand
 from evennia.utils.utils import list_to_string
@@ -43,7 +44,12 @@ class GitCommand(MuxCommand):
             raise InterruptCommand
         
         self.commit = self.repo.head.commit
-        self.branch = self.repo.active_branch.name
+
+        try:
+            self.branch = self.repo.active_branch.name
+        except TypeError as type_err:
+            self.caller.msg(type_err)
+            raise InterruptCommand
 
     def short_sha(self, repo, hexsha):
         """
diff --git a/evennia/contrib/utils/git_integration/tests.py b/evennia/contrib/utils/git_integration/tests.py
index 19703ceb90..c7193e33f0 100644
--- a/evennia/contrib/utils/git_integration/tests.py
+++ b/evennia/contrib/utils/git_integration/tests.py
@@ -75,11 +75,7 @@ class TestGitIntegration(EvenniaTest):
     
 class TestGitEvennia(BaseEvenniaCommandTest):
     def setUp(self):
-        super().setUp()
-        try:
-            self.repo = git.Repo(settings.EVENNIA_DIR, search_parent_directories=True)
-        except git.exc.InvalidGitRepositoryError:
-            print("Test TestGitEvennia failed, unable to find Evennia directory.")        
+        super().setUp()   
         self.commit = self.repo.head.commit
         self.branch = self.repo.active_branch.name