1 files changed, 11 insertions, 2 deletions
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/AuthenticationServer.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/AuthenticationServer.java
index a35bee2f8..e83718949 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/AuthenticationServer.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/AuthenticationServer.java
@@ -1705,11 +1705,13 @@ public class AuthenticationServer implements MOAIDAuthConstants {
         String destination = cpeps.getPepsURL().toExternalForm();
         Logger.debug("C-PEPS URL: " + destination);
 
-        String acsURL = HTTPUtils.getBaseURL(req) + PEPSConnectorServlet.PEPSCONNECTOR_SERVLET_URL_PATTERN;
+       
+        String issuerValue = AuthConfigurationProvider.getInstance().getPublicURLPrefix();
+        String acsURL = new DataURLBuilder().buildDataURL(issuerValue, 
+    			PEPSConnectorServlet.PEPSCONNECTOR_SERVLET_URL_PATTERN, moasession.getSessionID());
         Logger.debug("MOA Assertion Consumer URL (PEPSConnctor): " + acsURL);
 
         String providerName = oaParam.getFriendlyName();
-        String issuerValue = HTTPUtils.getBaseURL(req);
         Logger.debug("Issuer value: " + issuerValue);
 
         // prepare collection of required attributes
@@ -1782,6 +1784,13 @@ public class AuthenticationServer implements MOAIDAuthConstants {
         Logger.debug("STORK AuthnRequest succesfully assembled.");
 
         STORKSAMLEngine samlEngine = STORKSAMLEngine.getInstance("outgoing");
+        
+        if (samlEngine == null) {
+            Logger.error("Could not initalize STORK SAML engine.");
+            throw new MOAIDException("stork.00", null);
+        	
+        }
+        
         try {
             authnRequest = samlEngine.generateSTORKAuthnRequest(authnRequest);
         } catch (STORKSAMLEngineException e) {