1 files changed, 13 insertions, 7 deletions

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/legacy/BuildFromLegacyConfig.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/legacy/BuildFromLegacyConfig.java
index e6e77911a..864be253a 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/legacy/BuildFromLegacyConfig.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/legacy/BuildFromLegacyConfig.java
@@ -29,7 +29,6 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.math.BigInteger;
 import java.net.URI;
-import java.net.URL;
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -242,13 +241,19 @@ public class BuildFromLegacyConfig {
 	    		for (int i=0; i<transformsInfos.length; i++) {
 
 	    			TransformsInfoType transforminfotype = new TransformsInfoType();
-	    			
-	    			String fileURL = FileUtils.makeAbsoluteURL(transformsInfoFileNames[i], rootConfigFileDir);	    			    			
-	    			Path fileName_ = new File(new URI(fileURL)).toPath().getFileName();
-	    			transforminfotype.setFilename(fileName_.toString());
 	    		
-	    			transforminfotype.setTransformation(Base64Utils.encode(transformsInfos[i].getBytes("UTF-8")).getBytes("UTF-8"));
-	    			auth_transformInfos.add(transforminfotype); 
+	    			if (transformsInfoFileNames[i] != null && 
+	    					transformsInfos[i] != null) {	    			
+	    				String fileURL = FileUtils.makeAbsoluteURL(transformsInfoFileNames[i], rootConfigFileDir);	    			    			
+	    				Path fileName_ = new File(new URI(fileURL)).toPath().getFileName();
+	    				transforminfotype.setFilename(fileName_.toString());
+	    		
+	    				transforminfotype.setTransformation(Base64Utils.encode(transformsInfos[i].getBytes("UTF-8")).getBytes("UTF-8"));
+	    				auth_transformInfos.add(transforminfotype);
+	    				
+	    			} else
+	    				Logger.warn("AuthBlock Transformation " + transformsInfoFileNames[i] 
+	    						+ "not found.");
 	    		}
 	    		
 	    	} 
@@ -448,6 +453,7 @@ public class BuildFromLegacyConfig {
 	        	oa_saml1.setProvideStammzahl(oa.getProvideStammzahl());
 	        	oa_saml1.setUseCondition(oa.getUseCondition());
 	        	oa_saml1.setIsActive(true);
+	        	oa_saml1.setProvideAllErrors(false);
 	        	
 	        	//OA_PVP2
 	        	OAPVP2 oa_pvp2 = new OAPVP2();