1 files changed, 8 insertions, 4 deletions
diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/BasicOAAction.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/BasicOAAction.java
index 26d97484b..82390c49c 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/BasicOAAction.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/BasicOAAction.java
@@ -291,13 +291,17 @@ public class BasicOAAction extends BasicAction {
 	                
 	            } else {
 	
-	                if (oaid == -1) {	                		                	
+	                if (oaid == -1) {	                	
 	                	List<OnlineApplication> oaList = ConfigurationDBRead.getAllOnlineApplications();
-	                	for (OnlineApplication el : oaList) {
-	                		if (el.getPublicURLPrefix().startsWith(oaidentifier) )
-	                		onlineapplication = el;
+	                	
+	                	if (oaList != null) {
+	                		for (OnlineApplication el : oaList) {
+	                			if (el.getPublicURLPrefix().startsWith(oaidentifier) )
+	                				onlineapplication = el;
 	                		
+	                		}
 	                	}
+	                	
 	                	if (onlineapplication == null) {	                	
 	                		onlineapplication = ConfigurationDBRead.getOnlineApplication(oaidentifier);