1 files changed, 6 insertions, 4 deletions
diff --git a/src/main/java/at/gv/egiz/moazs/mzs/MzsService.java b/src/main/java/at/gv/egiz/moazs/mzs/MzsService.java
index bb927ba..928e3d7 100644
--- a/src/main/java/at/gv/egiz/moazs/mzs/MzsService.java
+++ b/src/main/java/at/gv/egiz/moazs/mzs/MzsService.java
@@ -20,6 +20,7 @@ import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 
 import static at.gv.egiz.moazs.MoaZSException.moaZSException;
+import static at.gv.egiz.moazs.MoaZSException.moaZSExceptionBuilder;
 import static at.gv.zustellung.app2mzs.xsd.PartialSuccessType.partialSuccessTypeBuilder;
 import static java.lang.String.format;
 import static java.util.concurrent.CompletableFuture.supplyAsync;
@@ -70,10 +71,11 @@ public class MzsService implements App2MzsPortType {
             future.thenAccept(appClient::sendNotification);
             return generatePartialSuccessResponse(appDeliveryID);
 
-        } catch (Exception e ) {
-            var message = format("An error occurred while processing DeliveryRequest with AppDeliveryID=%s.", appDeliveryID);
-            throw new MoaZSException(message, e);
-
+        } catch (Exception e) {
+            throw moaZSExceptionBuilder("An error occurred while processing DeliveryRequest " +
+                    "with AppDeliveryID=%s.", appDeliveryID)
+                    .withCause(e)
+                    .build();
         }
 
     }