diff --git a/src/main/java/org/jenkinsci/plugins/osfbuildersuiteforsfcc/dataimport/DataImportBuilder.java b/src/main/java/org/jenkinsci/plugins/osfbuildersuiteforsfcc/dataimport/DataImportBuilder.java
index 363aaee..1c30b07 100644
--- a/src/main/java/org/jenkinsci/plugins/osfbuildersuiteforsfcc/dataimport/DataImportBuilder.java
+++ b/src/main/java/org/jenkinsci/plugins/osfbuildersuiteforsfcc/dataimport/DataImportBuilder.java
@@ -305,9 +305,12 @@ public void perform(
         List<String> previousDataFingerprints = new ArrayList<>();
         Run<?, ?> previousBuild = build.getPreviousBuild();
         if (previousBuild != null) {
-            previousBuild.getActions(DataImportAction.class).forEach(
-                    (dataImportAction) -> previousDataFingerprints.addAll(dataImportAction.getDataFingerprints())
-            );
+            previousBuild.getActions(DataImportAction.class).forEach((dataImportAction) -> {
+                List<String> dataFingerprints = dataImportAction.getDataFingerprints();
+                if (dataFingerprints != null && !dataFingerprints.isEmpty()) {
+                    previousDataFingerprints.addAll(dataFingerprints);
+                }
+            });
         }
 
         DataImportResult dataImportResult = workspace.act(new DataImportCallable(