1 files changed, 9 insertions, 3 deletions
diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OASTORKConfig.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OASTORKConfig.java
index be5b2200b..363c094ff 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OASTORKConfig.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OASTORKConfig.java
@@ -253,9 +253,15 @@ public class OASTORKConfig implements IOnlineApplicationData{
 	public List<CPEPS> getEnabledCPEPS() {
 		if (enabledCitizenCountries != null) {
 			List<CPEPS> result = new ArrayList<CPEPS>();
-			for(CPEPS current : ConfigurationDBRead.getMOAIDConfiguration().getAuthComponentGeneral().getForeignIdentities().getSTORK().getCPEPS()) {
-				if(enabledCitizenCountries.contains(current.getCountryCode()))
-					result.add(current);
+			
+			try {
+				for(CPEPS current : ConfigurationDBRead.getMOAIDConfiguration().getAuthComponentGeneral().getForeignIdentities().getSTORK().getCPEPS()) {
+					if(enabledCitizenCountries.contains(current.getCountryCode()))
+						result.add(current);
+				}
+				
+			} catch (NullPointerException e){
+				
 			}
 			return result;
 		}