diff --git a/dhp-workflows/dhp-graph-mapper/src/main/java/eu/dnetlib/dhp/oa/graph/clean/GetDatasourceFromCountry.java b/dhp-workflows/dhp-graph-mapper/src/main/java/eu/dnetlib/dhp/oa/graph/clean/GetDatasourceFromCountry.java
index a69b1a8bf..85e446121 100644
--- a/dhp-workflows/dhp-graph-mapper/src/main/java/eu/dnetlib/dhp/oa/graph/clean/GetDatasourceFromCountry.java
+++ b/dhp-workflows/dhp-graph-mapper/src/main/java/eu/dnetlib/dhp/oa/graph/clean/GetDatasourceFromCountry.java
@@ -78,6 +78,8 @@ public class GetDatasourceFromCountry implements Serializable {
 				Encoders.bean(Organization.class))
 			.filter(
 				(FilterFunction<Organization>) o -> !o.getDataInfo().getDeletedbyinference() &&
+					o.getCountry() != null &&
+					o.getCountry().getClassid() != null &&
 					o.getCountry().getClassid().length() > 0 &&
 					o.getCountry().getClassid().equals(country));