diff --git a/src/main/java/org/jboss/pnc/deliverablesanalyzer/model/FinderResultCreator.java b/src/main/java/org/jboss/pnc/deliverablesanalyzer/model/FinderResultCreator.java
index 86230cb..d7bd0f6 100644
--- a/src/main/java/org/jboss/pnc/deliverablesanalyzer/model/FinderResultCreator.java
+++ b/src/main/java/org/jboss/pnc/deliverablesanalyzer/model/FinderResultCreator.java
@@ -25,6 +25,7 @@
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
 import java.util.stream.Collectors;
@@ -294,19 +295,10 @@ private static Set<Build> getFoundBuilds(Map<BuildSystemInteger, KojiBuild> buil
 
                 if (LOGGER.isDebugEnabled()) {
                     archiveCount++;
-                    String identifier;
-                    switch (artifact.getBuildSystemType()) {
-                        case BREW:
-                            identifier = "Brew#" + artifact.getBrewId();
-                            break;
-                        case PNC:
-                            identifier = "PNC#" + artifact.getPncId();
-                            break;
-                        default:
-                            identifier = "Unknown#-1";
-                            break;
-                    }
-
+                    String identifier = getIdentifier(
+                            artifact.getBuildSystemType(),
+                            artifact.getBrewId(),
+                            artifact.getPncId());
                     LOGGER.debug("Artifact: {} / {} ({})", archiveCount, numArchives, identifier);
                 }
             }
@@ -315,20 +307,7 @@ private static Set<Build> getFoundBuilds(Map<BuildSystemInteger, KojiBuild> buil
 
             if (LOGGER.isDebugEnabled()) {
                 buildCount++;
-
-                String identifier;
-                switch (build.getBuildSystemType()) {
-                    case BREW:
-                        identifier = "Brew#" + build.getBrewId();
-                        break;
-                    case PNC:
-                        identifier = "PNC#" + build.getPncId();
-                        break;
-                    default:
-                        identifier = "Unknown#-1";
-                        break;
-                }
-
+                String identifier = getIdentifier(build.getBuildSystemType(), build.getBrewId(), build.getPncId());
                 LOGGER.debug("Build: {} / {} ({})", buildCount, numBuilds, identifier);
             }
 
@@ -337,4 +316,20 @@ private static Set<Build> getFoundBuilds(Map<BuildSystemInteger, KojiBuild> buil
 
         return Collections.unmodifiableSet(buildList);
     }
+
+    private static String getIdentifier(BuildSystemType buildSystemType, Long brewId, String pncId) {
+        String identifier;
+        switch (buildSystemType) {
+            case BREW:
+                identifier = "Brew#" + Objects.requireNonNullElse(brewId, "-1");
+                break;
+            case PNC:
+                identifier = "PNC#" + pncId;
+                break;
+            default:
+                identifier = "Unknown#-1";
+                break;
+        }
+        return identifier;
+    }
 }