diff --git a/dhp-common/src/main/java/eu/dnetlib/dhp/schema/oaf/CleaningFunctions.java b/dhp-common/src/main/java/eu/dnetlib/dhp/schema/oaf/CleaningFunctions.java
index 3be062c0c..401d5d444 100644
--- a/dhp-common/src/main/java/eu/dnetlib/dhp/schema/oaf/CleaningFunctions.java
+++ b/dhp-common/src/main/java/eu/dnetlib/dhp/schema/oaf/CleaningFunctions.java
@@ -155,12 +155,14 @@ public class CleaningFunctions {
 							final Set<StructuredProperty> pids =
 									pid
 										.stream()
+										.filter(Objects::nonNull)
 										.filter(p -> StringUtils.isNotBlank(p.getValue()))
 										.collect(Collectors.toCollection(HashSet::new));
 
 							Optional.ofNullable(i.getAlternateIdentifier())
 									.ifPresent(altId -> {
 										final Set<StructuredProperty> altIds = altId.stream()
+												.filter(Objects::nonNull)
 												.filter(p -> StringUtils.isNotBlank(p.getValue()))
 												.collect(Collectors.toCollection(HashSet::new));