From 8c2ae8cf463329acd55b7258faf180901666a921 Mon Sep 17 00:00:00 2001
From: George Kalampokis <gkalampokis@cite.gr>
Date: Mon, 26 Oct 2020 18:03:07 +0200
Subject: [PATCH] Add null check on the Organisation fromMap mapper

---
 .../eu/eudat/models/data/dmp/Organisation.java   | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/dmp/Organisation.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/dmp/Organisation.java
index 7fbc5b25a..0d48f4672 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/models/data/dmp/Organisation.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/dmp/Organisation.java
@@ -99,13 +99,15 @@ public class Organisation implements DataModel<eu.eudat.data.entities.Organisati
     
     public static Organisation fromMap(HashMap<String, Object> map) {
     	Organisation model = new Organisation();
-    	model.id = (String) map.get("id");
-    	model.key = (String) map.get("key");
-    	model.label = (String) map.get("label");
-    	model.name = (String) map.get("name");
-    	model.reference = (String) map.get("reference");
-    	model.status = (int) map.get("status");
-    	model.tag = (String) map.get("tag");
+    	if (map != null) {
+            model.id = (String) map.get("id");
+            model.key = (String) map.get("key");
+            model.label = (String) map.get("label");
+            model.name = (String) map.get("name");
+            model.reference = (String) map.get("reference");
+            model.status = (int) map.get("status");
+            model.tag = (String) map.get("tag");
+        }
     	return model;
     }