diff --git a/dump/src/main/java/eu/dnetlib/dhp/oa/graph/dump/eosc/ExtendEoscResultWithOrganizationStep2.java b/dump/src/main/java/eu/dnetlib/dhp/oa/graph/dump/eosc/ExtendEoscResultWithOrganizationStep2.java
index 132fc03..48a6cd2 100644
--- a/dump/src/main/java/eu/dnetlib/dhp/oa/graph/dump/eosc/ExtendEoscResultWithOrganizationStep2.java
+++ b/dump/src/main/java/eu/dnetlib/dhp/oa/graph/dump/eosc/ExtendEoscResultWithOrganizationStep2.java
@@ -100,11 +100,12 @@ public class ExtendEoscResultWithOrganizationStep2 implements Serializable {
 					org.setId(t2._2().getId());
 					org.setName(t2._2().getLegalname().getValue());
 					HashMap<String, Set<String>> organizationPids = new HashMap<>();
-					t2._2().getPid().forEach(p -> {
-						if (!organizationPids.containsKey(p.getQualifier().getClassid()))
-							organizationPids.put(p.getQualifier().getClassid(), new HashSet<>());
-						organizationPids.get(p.getQualifier().getClassid()).add(p.getValue());
-					});
+					if(Optional.ofNullable(t2._2().getPid()).isPresent())
+						t2._2().getPid().forEach(p -> {
+							if (!organizationPids.containsKey(p.getQualifier().getClassid()))
+								organizationPids.put(p.getQualifier().getClassid(), new HashSet<>());
+							organizationPids.get(p.getQualifier().getClassid()).add(p.getValue());
+						});
 					List<OrganizationPid> pids = new ArrayList<>();
 					for (String key : organizationPids.keySet()) {
 						for (String value : organizationPids.get(key)) {