diff --git a/fdroidserver/common.py b/fdroidserver/common.py
index b2127ddf..4a30bb6b 100644
--- a/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@ -1523,10 +1523,15 @@ class vcs_git(vcs):
         it!  This is called as a safety check.
 
         """
-        p = FDroidPopen(['git', 'rev-parse', '--show-toplevel'], cwd=self.local, output=False)
+        cmd = ['git', 'rev-parse', '--show-toplevel']
+        p = FDroidPopen(cmd, cwd=self.local, output=False)
         result = p.output.rstrip()
+        if p.returncode > 0:
+            raise VCSException(
+                f"`{' '.join(cmd)}` failed, (in '{os.path.abspath(self.local)}') {result}"
+            )
         if Path(result) != Path(self.local).resolve():
-            raise VCSException('Repository mismatch')
+            raise VCSException(f"Repository mismatch ('{self.local}' != '{result}')")
 
     def gotorevisionx(self, rev):
         if not os.path.exists(self.local):
diff --git a/fdroidserver/metadata.py b/fdroidserver/metadata.py
index 08d275ae..f5fcffac 100644
--- a/fdroidserver/metadata.py
+++ b/fdroidserver/metadata.py
@@ -538,10 +538,10 @@ def read_srclibs():
 
     srclibs = {}
 
-    srcdir = Path('srclibs')
-    srcdir.mkdir(exist_ok=True)
+    srclibs_dir = Path('srclibs')
+    srclibs_dir.mkdir(exist_ok=True)
 
-    for metadatapath in sorted(srcdir.glob('*.yml')):
+    for metadatapath in sorted(srclibs_dir.glob('*.yml')):
         srclibs[metadatapath.stem] = parse_yaml_srclib(metadatapath)