diff --git a/src/Mod/AddonManager/addonmanager_workers.py b/src/Mod/AddonManager/addonmanager_workers.py
index 470d5b7bc3..04be5c935f 100644
--- a/src/Mod/AddonManager/addonmanager_workers.py
+++ b/src/Mod/AddonManager/addonmanager_workers.py
@@ -259,11 +259,16 @@ class CheckWBWorker(QtCore.QThread):
                     except Exception:
                         print("AddonManager: Unable to fetch git updates for repo", repo[0])
                     else:
-                        if "git pull" in gitrepo.status():
-                            self.mark.emit(repo[0])
-                            upds.append(repo[0])
-                            # mark as already installed AND already checked for updates AND update available
-                            self.repos[self.repos.index(repo)][2] = 3
+                        try:
+                            if "git pull" in gitrepo.status():
+                                self.mark.emit(repo[0])
+                                upds.append(repo[0])
+                                # mark as already installed AND already checked for updates AND update available
+                                self.repos[self.repos.index(repo)][2] = 3
+                        except stderr:
+                            FreeCAD.Console.PrintWarning(translate("AddonsInstaller",
+                                                                   "AddonManager - " + repo[0]) + " git status"
+                                                                   " fatal: this operation must be run in a work tree \n")
         self.addon_repos.emit(self.repos)
         self.enable.emit(len(upds))
         self.stop = True