1 files changed, 7 insertions, 6 deletions
diff --git a/src/main/java/at/gv/egiz/moazs/backend/DeliveryRequestBackend.java b/src/main/java/at/gv/egiz/moazs/backend/DeliveryRequestBackend.java
index 6a1e0fd..72f8ba0 100644
--- a/src/main/java/at/gv/egiz/moazs/backend/DeliveryRequestBackend.java
+++ b/src/main/java/at/gv/egiz/moazs/backend/DeliveryRequestBackend.java
@@ -18,10 +18,10 @@ import org.springframework.stereotype.Component;
 
 import java.util.function.Consumer;
 
-import static at.gv.egiz.moazs.scheme.RequestStatusResponse.*;
+import static at.gv.egiz.moazs.MoaZSException.moaZSException;
 import static at.gv.egiz.moazs.scheme.RequestStatusResponse.generateError;
+import static at.gv.egiz.moazs.scheme.RequestStatusResponse.getAnswer;
 import static at.gv.zustellung.msg.xsd.DeliveryRequestStatusType.Error.errorBuilder;
-import static at.gv.zustellung.msg.xsd.DeliveryRequestStatusType.deliveryRequestStatusTypeBuilder;
 import static java.lang.String.format;
 
 @Component
@@ -72,7 +72,7 @@ public class DeliveryRequestBackend implements Consumer<String> {
 
         try {
             var mzsRequest = repository.retrieveDeliveryRequest(appDeliveryID).orElseThrow(
-                    () -> MoaZSException.moaZSException(format(DELIVERY_REQUEST_MISSING_ERROR_MSG, appDeliveryID)));
+                    () -> moaZSException(format(DELIVERY_REQUEST_MISSING_ERROR_MSG, appDeliveryID)));
             fallbackAnswerBuilder.withDeliverySystem(mzsRequest.getConfig().getMSGClient().getURL());
 
             var msgRequest = buildMsgRequest(mzsRequest);
@@ -98,14 +98,15 @@ public class DeliveryRequestBackend implements Consumer<String> {
     }
 
     private void verifySignedStatus(String responseID, String appDeliveryID) throws MoaZSException {
+        var signedStatus = repository.retrieveBinaryResponse(responseID).orElseThrow(() -> moaZSException(
+                format(BINARY_RESPONSE_MISSING_ERROR_MSG, responseID),
+                MoaZSException.ERROR_MZS_BINARY_RESPONSE_MISSING));
         try {
-            var signedStatus = repository.retrieveBinaryResponse(responseID).orElseThrow(
-                    () -> MoaZSException.moaZSException(format(BINARY_RESPONSE_MISSING_ERROR_MSG, responseID)));
             signatureVerifier.accept(signedStatus);
         } catch (MoaZSException ex) {
             var message = format(MsgResponseBackend.MOASP_SIGNATURE_INVALID_ERROR_MSG, appDeliveryID);
             var code = MoaZSException.ERROR_MOASP_SIGNATURE_INVALID;
-            throw MoaZSException.moaZSException(message, code, ex);
+            throw moaZSException(message, code, ex);
         }
     }