diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/DebuggerAgent.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/DebuggerAgent.java
index 1e0cf6ded5c..2cde2423fa7 100644
--- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/DebuggerAgent.java
+++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/DebuggerAgent.java
@@ -371,9 +371,15 @@ private static DebuggerSink createDebuggerSink(
   }
 
   public static String getDefaultTagsMergedWithGlobalTags(Config config) {
-    GitInfo gitInfo = GitInfoProvider.INSTANCE.getGitInfo();
-    String gitSha = gitInfo.getCommit().getSha();
-    String gitUrl = gitInfo.getRepositoryURL();
+    String gitSha = null;
+    String gitUrl = null;
+    try {
+      GitInfo gitInfo = GitInfoProvider.INSTANCE.getGitInfo();
+      gitSha = gitInfo.getCommit().getSha();
+      gitUrl = gitInfo.getRepositoryURL();
+    } catch (Exception e) {
+      LOGGER.error("Failed to retrieve git info: ", e);
+    }
     String debuggerTags =
         TagsHelper.concatTags(
             "env:" + config.getEnv(),