1 files changed, 6 insertions, 2 deletions
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/STORKProtocol.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/STORKProtocol.java
index e68b66510..3762a5101 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/STORKProtocol.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/STORKProtocol.java
@@ -31,6 +31,7 @@ public class STORKProtocol implements IModulInfo, MOAIDAuthConstants {
 
     public static final String AUTHENTICATIONREQUEST = "AuthenticationRequest";
     public static final String ATTRIBUTE_COLLECTOR = "AttributeCollector";
+    public static final String MANDATERETRIEVALREQUEST = "MandateRetrievalRequest";
 
     private static HashMap<String, IAction> actions = new HashMap<String, IAction>();
 
@@ -102,16 +103,19 @@ public class STORKProtocol implements IModulInfo, MOAIDAuthConstants {
             authnRequest = authnEngine.validateSTORKAuthnRequest(decSamlToken);
         } catch (STORKSAMLEngineException ex) {
             Logger.error("Unable to validate Stork AuthenticationRequest: " + ex.getMessage());
+        }  catch (ClassCastException e) {
+            Logger.error("Could not extract authenticaiton request");
         }
 
 
-        // check if a valid attr request is container
+        // check if a valid attr request is containerd
         try {
             attrRequest = attrEngine.validateSTORKAttrQueryRequest(decSamlToken);
         } catch (STORKSAMLEngineException ex) {
             Logger.error("Unable to validate Stork AuthenticationRequest: " + ex.getMessage());
+        } catch (ClassCastException e) {
+            Logger.error("Could not extract attribute request");
         }
-
         // if there is no authn or attr request, raise error
         if ((authnRequest == null) && (attrRequest == null)) {
             Logger.error("There is no authentication or attribute request contained.");