diff --git a/dmp-backend/dataverseRepository/src/main/java/eu/eudat/depositinterface/dataverserepository/interfaces/DataverseDeposit.java b/dmp-backend/dataverseRepository/src/main/java/eu/eudat/depositinterface/dataverserepository/interfaces/DataverseDeposit.java
index ebaf15298..588a8807e 100644
--- a/dmp-backend/dataverseRepository/src/main/java/eu/eudat/depositinterface/dataverserepository/interfaces/DataverseDeposit.java
+++ b/dmp-backend/dataverseRepository/src/main/java/eu/eudat/depositinterface/dataverserepository/interfaces/DataverseDeposit.java
@@ -150,7 +150,9 @@ public class DataverseDeposit implements RepositoryDeposit {
         this.uploadFile(jsonFileName, rdaJson, doi);
         Files.deleteIfExists(rdaJson.toPath());
 
-        this.uploadFile(dmpDepositModel.getSupportingFilesZip().getName(), dmpDepositModel.getSupportingFilesZip(), doi);
+        if(dmpDepositModel.getSupportingFilesZip() != null) {
+            this.uploadFile(dmpDepositModel.getSupportingFilesZip().getName(), dmpDepositModel.getSupportingFilesZip(), doi);
+        }
     }
 
     private Map<String, Object> getDatasetIdentifier(String previousDOI) {
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 6abdff7b5..92bb24daa 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
@@ -2196,7 +2196,7 @@ public class DataManagementPlanManager {
         FileOutputStream fout = new FileOutputStream(this.environment.getProperty("temp.temp") + "supportingFiles.zip");
         ZipOutputStream zout = new ZipOutputStream(fout);
 
-        //List<File> supportingFiles = new ArrayList<>();
+        boolean hasFileUploaded = false;
         Set<Dataset> datasets = dmp.getDataset();
         for (Dataset dataset : datasets) {
             List<FileUpload> files = this.apiContext.getOperationsContext().getDatabaseRepository().getFileUploadDao().getFileUploads(dataset.getId());
@@ -2209,12 +2209,12 @@ public class DataManagementPlanManager {
                     zout.putNextEntry(ze);
                     zout.write(content, 0, content.length);
                     zout.closeEntry();
-
+                    hasFileUploaded = true;
                 }
             }
         }
         zout.close();
-        return new File(this.environment.getProperty("temp.temp") + "supportingFiles.zip");
+        return hasFileUploaded ? new File(this.environment.getProperty("temp.temp") + "supportingFiles.zip") : null;
     }
 
     /*