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 390e9fe57..2a3941f35 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
@@ -1633,7 +1633,13 @@ public class DataManagementPlanManager {
 
         wordBuilder.fillFooter(dmpEntity, null, document, false);
 
-        String fileName = "DMP_" + dmpEntity.getGrant().getLabel();
+        String fileName;
+        if (dmpEntity.getGrant() !=  null && dmpEntity.getGrant().getLabel() != null) {
+            fileName = "DMP_" + dmpEntity.getGrant().getLabel();
+        }
+        else {
+            fileName = "DMP_" + dmpEntity.getLabel();
+        }
         if (versioned) {
             fileName += "_" + dmpEntity.getVersion();
         }
@@ -1882,7 +1888,12 @@ public class DataManagementPlanManager {
         writer.close();
         FileEnvelope fileEnvelope = new FileEnvelope();
         fileEnvelope.setFile(xmlFile);
-        fileEnvelope.setFilename("DMP_" + dmp.getGrant().getLabel() + "_" + dmp.getVersion() + ".xml");
+        if (dmp.getGrant() !=  null && dmp.getGrant().getLabel() != null) {
+            fileEnvelope.setFilename("DMP_" + dmp.getGrant().getLabel() + "_" + dmp.getVersion() + ".xml");
+        }
+        else {
+            fileEnvelope.setFilename("DMP_" + dmp.getLabel() + "_" + dmp.getVersion() + ".xml");
+        }
 
         return fileEnvelope;
     }
@@ -1900,7 +1911,13 @@ public class DataManagementPlanManager {
                 .collect(Collectors.toSet()));
         String result = rdaManager.convertToRDA(dmp);
 
-        String fileName = "DMP_" + dmp.getGrant().getLabel() + "_" + dmp.getVersion();
+        String fileName;
+        if (dmp.getGrant() !=  null && dmp.getGrant().getLabel() != null) {
+            fileName = "DMP_" + dmp.getGrant().getLabel() + "_" + dmp.getVersion();
+        }
+        else {
+            fileName = "DMP_" + dmp.getLabel() + "_" + dmp.getVersion();
+        }
         fileName = fileName.replaceAll("[^a-zA-Z0-9+ ]", "").replace(" ", "_").replace(",", "_");
         String uuid = UUID.randomUUID().toString();
         File file = new File(this.environment.getProperty("temp.temp") + uuid + ".json");