diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/DossierPersistenceService.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/DossierPersistenceService.java
index daa14f42f..98af11766 100644
--- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/DossierPersistenceService.java
+++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/DossierPersistenceService.java
@@ -110,7 +110,7 @@ public class DossierPersistenceService {
     public void undelete(String dossierId) {
         dossierRepository.findById(dossierId).ifPresent(dossier -> {
             if (dossier.getHardDeletedTime() != null) {
-                throw new BadRequestException("Cannot undelete a hard-dossier file!");
+                throw new BadRequestException("Cannot undelete a hard-deleted dossier!");
             }
             dossier.setStatus(DossierStatus.ACTIVE);
             dossier.setSoftDeletedTime(null);
diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/FileStatusPersistenceService.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/FileStatusPersistenceService.java
index 266126675..afd8a4fec 100644
--- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/FileStatusPersistenceService.java
+++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/FileStatusPersistenceService.java
@@ -251,7 +251,7 @@ public class FileStatusPersistenceService {
 
         fileRepository.findById(fileId).ifPresentOrElse((file) -> {
             if (file.getHardDeletedTime() != null) {
-                throw new BadRequestException("Cannot undelete a hard-dossier file!");
+                throw new BadRequestException("Cannot undelete a hard-deleted file!");
             }
             file.setStatus(statusBefore != null ? statusBefore : FileStatus.UNASSIGNED);
             file.setDeleted(null);
diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/DossierTest.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/DossierTest.java
index d3cfb8953..d4eb09bbf 100644
--- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/DossierTest.java
+++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/DossierTest.java
@@ -1,15 +1,19 @@
 package com.iqser.red.service.peristence.v1.server.integration.tests;
 
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
+import org.junit.Test;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+
 import com.google.common.collect.Sets;
 import com.iqser.red.service.peristence.v1.server.integration.client.DossierClient;
 import com.iqser.red.service.peristence.v1.server.integration.service.DossierTesterAndProvider;
 import com.iqser.red.service.peristence.v1.server.integration.utils.AbstractPersistenceServerServiceTest;
 import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.CreateOrUpdateDossierRequest;
-import org.junit.Test;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 
-import static org.assertj.core.api.Assertions.assertThat;
+import feign.FeignException;
 
 public class DossierTest extends AbstractPersistenceServerServiceTest {
 
@@ -58,5 +62,6 @@ public class DossierTest extends AbstractPersistenceServerServiceTest {
         assertThat(dossierClient.getAllDossiers()).isEmpty();
         assertThat(dossierClient.getSoftDeletedDossiers()).isEmpty();
 
+        assertThatThrownBy(() -> dossierClient.undeleteDossiers(Sets.newHashSet(dossier.getId()))).isInstanceOf(FeignException.class);
     }
 }