diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/dmp/DataManagementPlan.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/dmp/DataManagementPlan.java
index 67d4eadc1..d018cab85 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/models/data/dmp/DataManagementPlan.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/dmp/DataManagementPlan.java
@@ -252,13 +252,15 @@ public class DataManagementPlan implements DataModel<DMP, DataManagementPlan> {
         this.users = entity.getUsers().stream().map(item -> new UserInfoListingModel().fromDataModel(item)).collect(Collectors.toList());
         this.doi = entity.getDoi();
 
-        this.project = new Project();
-        if (entity.getProject() != null)
+        if (entity.getProject() != null) {
+            this.project = new Project();
             this.project = new Project().fromDataModel(entity.getProject());
+        }
 
-        this.funder = new Funder();
-        if (entity.getGrant().getFunder() != null)
+        if (entity.getGrant().getFunder() != null) {
+            this.funder = new Funder();
             this.funder.fromDataModel(entity.getGrant().getFunder());
+        }
 
         return this;
     }