1 files changed, 7 insertions, 2 deletions
diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OASAML1Config.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OASAML1Config.java
index 951052877..c4c945bec 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OASAML1Config.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OASAML1Config.java
@@ -29,8 +29,13 @@ public class OASAML1Config {
 				provideFullMandateData = saml1.isProvideFullMandatorData();
 				provideIdentityLink = saml1.isProvideIdentityLink();
 				provideStammZahl = saml1.isProvideStammzahl();
-				useCondition = saml1.isUseCondition();
-				conditionLength = saml1.getConditionLength().intValue();
+				
+				if (saml1.isUseCondition() != null)
+					useCondition = saml1.isUseCondition();
+				
+				if (saml1.getConditionLength() != null)
+					conditionLength = saml1.getConditionLength().intValue();
+				
 				if (saml1.isIsActive() != null)
 					isActive = saml1.isIsActive();
 			}