diff --git a/client/idrepo/lib/src/main/java/org/apache/syncope/client/lib/SyncopeAnonymousClient.java b/client/idrepo/lib/src/main/java/org/apache/syncope/client/lib/SyncopeAnonymousClient.java
index ebb3ed77db..6e8d75896c 100644
--- a/client/idrepo/lib/src/main/java/org/apache/syncope/client/lib/SyncopeAnonymousClient.java
+++ b/client/idrepo/lib/src/main/java/org/apache/syncope/client/lib/SyncopeAnonymousClient.java
@@ -74,7 +74,9 @@ public Pair<String, String> gitAndBuildInfo() {
         try {
             JsonNode info = info();
             return Pair.of(
-                    info.has("git") ? info.get("git").get("commit").get("id").asText() : StringUtils.EMPTY,
+                    info.has("git") && info.get("git").has("commit") && info.get("git").get("commit").has("id")
+                    ? info.get("git").get("commit").get("id").asText()
+                    : StringUtils.EMPTY,
                     info.get("build").get("version").asText());
         } catch (IOException e) {
             throw new RuntimeException("While getting build and git Info", e);