diff --git a/plugins/scm-git-plugin/src/main/java/sonia/scm/web/GitRepositoryResolver.java b/plugins/scm-git-plugin/src/main/java/sonia/scm/web/GitRepositoryResolver.java
index 4de040b992..4516e12d53 100644
--- a/plugins/scm-git-plugin/src/main/java/sonia/scm/web/GitRepositoryResolver.java
+++ b/plugins/scm-git-plugin/src/main/java/sonia/scm/web/GitRepositoryResolver.java
@@ -181,6 +181,15 @@ public class GitRepositoryResolver
         repository = RepositoryCache.open(FileKey.lenient(gitdir, FS.DETECTED),
                                           true);
       }
+      else
+      {
+        if (logger.isWarnEnabled())
+        {
+          logger.warn("gitconfig is not valid, the service is not available");
+        }
+
+        throw new ServiceNotEnabledException();
+      }
     }
     catch (RuntimeException e)
     {