diff --git a/src/main/java/eu/dnetlib/repo/manager/utils/Converter.java b/src/main/java/eu/dnetlib/repo/manager/utils/Converter.java
index a807ee2..1f5f5d9 100644
--- a/src/main/java/eu/dnetlib/repo/manager/utils/Converter.java
+++ b/src/main/java/eu/dnetlib/repo/manager/utils/Converter.java
@@ -281,10 +281,16 @@ public class Converter {
 
         //TODO check identitites
         //Map<String,String> identity = new HashMap<>();
-        Map<String, Object> identities = new HashMap<>();
-        identities.put("issuertype", "piwik");
-        identities.put("pid","piwik:"+repository.getPiwikInfo().getSiteId());
-        repositoryMap.put("identities",identities);
+
+        if (repository.getPiwikInfo() != null) {
+            Map<String, Object> identities = new HashMap<>();
+
+            identities.put("issuertype", "piwik");
+            identities.put("pid", "piwik:" + repository.getPiwikInfo().getSiteId());
+
+            repositoryMap.put("identities", identities);
+        }
+
         repositoryMap.put("subjects","");
 
         return mapper.writeValueAsString(repositoryMap);