1 files changed, 10 insertions, 4 deletions
diff --git a/eidas_modules/eidas_proxy-sevice/src/main/java/at/asitplus/eidas/specific/modules/msproxyservice/protocol/EidasProxyServiceController.java b/eidas_modules/eidas_proxy-sevice/src/main/java/at/asitplus/eidas/specific/modules/msproxyservice/protocol/EidasProxyServiceController.java
index 4b699bae..606dbb39 100644
--- a/eidas_modules/eidas_proxy-sevice/src/main/java/at/asitplus/eidas/specific/modules/msproxyservice/protocol/EidasProxyServiceController.java
+++ b/eidas_modules/eidas_proxy-sevice/src/main/java/at/asitplus/eidas/specific/modules/msproxyservice/protocol/EidasProxyServiceController.java
@@ -402,14 +402,20 @@ public class EidasProxyServiceController extends AbstractController implements I
       spConfig.setMandateMode(SpMandateModes.NATURAL);
       
     }
-
-    log.debug("Set mandate-profiles: {} to request from issuer: {}",
-        spConfig.getMandateProfiles(), spConfig.getUniqueIdentifier());
-
     
     if (isLegalPersonRequested && spConfig.getMandateProfiles().isEmpty()) {
       throw new EidasProxyServiceException(ERROR_10, null);
       
+    } else if (spConfig.getMandateProfiles().isEmpty()) {
+      log.debug("No mandate-profiles for issure: {}. Set mandate-mode to 'none'",  
+          spConfig.getUniqueIdentifier());
+      spConfig.setMandateMode(SpMandateModes.NONE);
+      
+    } else {
+      log.debug("Set mandate-profiles: {} to request from issuer: {}",
+          spConfig.getMandateProfiles(), spConfig.getUniqueIdentifier());
+
+      
     }
     
   }