From c3aff92cd4bb6eaaac47c5281be458f723425524 Mon Sep 17 00:00:00 2001
From: George Kalampokis <gkalampokis@cite.gr>
Date: Mon, 28 Feb 2022 16:28:31 +0200
Subject: [PATCH] Don't include Funder if it's not in the Doi Funder Table

---
 .../eudat/logic/managers/DataManagementPlanManager.java   | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java
index d8e2503f0..f3360b2c4 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java
@@ -2095,9 +2095,11 @@ public class DataManagementPlanManager {
         if (grantReferenceHead.equals("openaire")) {
             String grantReferenceTail = dmp.getGrant().getReference().split(":")[3];
             DoiFunder doiFunder = this.apiContext.getOperationsContext().getDatabaseRepository().getDoiFunderDao().findFunderByName(dmp.getGrant().getFunder().getLabel());
-            String finalId = doiFunder.getDoi() + "::" + grantReferenceTail;
-            dataBuilder.append("        \"grants\": [{\n");
-            dataBuilder.append("        \t\t\"id\": \"").append(finalId).append("\"\n}],\n");
+            if (doiFunder != null) {
+                String finalId = doiFunder.getDoi() + "::" + grantReferenceTail;
+                dataBuilder.append("        \"grants\": [{\n");
+                dataBuilder.append("        \t\t\"id\": \"").append(finalId).append("\"\n}],\n");
+            }
         }
 
         dataBuilder.append("        \"creators\": [{\n");