diff --git a/MacroCacheCreator.py b/MacroCacheCreator.py
index 79fb3f1e..6d2f4125 100644
--- a/MacroCacheCreator.py
+++ b/MacroCacheCreator.py
@@ -94,7 +94,8 @@ def retrieve_macros_from_git(self):
         """Retrieve macros from GIT_MACROS_URL"""
 
         try:
-            CacheWriter.clone_or_update(GIT_MACROS_CLONE_NAME, GIT_MACROS_URL, GIT_MACROS_BRANCH)
+            writer = CacheWriter()
+            writer.clone_or_update(GIT_MACROS_CLONE_NAME, GIT_MACROS_URL, GIT_MACROS_BRANCH)
         except RuntimeError as e:
             print(f"Failed to clone git macros from {GIT_MACROS_URL}: {e}")
             self.macro_errors["retrieve_macros_from_git"] = str(e)
diff --git a/addonmanager_macro.py b/addonmanager_macro.py
index 894a34ed..fb44ffb8 100644
--- a/addonmanager_macro.py
+++ b/addonmanager_macro.py
@@ -173,7 +173,10 @@ def fill_details_from_wiki(self, url):
             code = self._read_code_from_wiki(p)
         if not code:
             self._console.PrintWarning(
-                translate("AddonsInstaller", "Unable to fetch the code of this macro.") + "\n"
+                translate("AddonsInstaller", "Unable to fetch the code of macro '{}'").format(
+                    self.name
+                )
+                + "\n"
             )
             return