Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesDesign/DesignCalculator.cs
===================================================================
diff -u -r2567 -r2575
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesDesign/DesignCalculator.cs	(.../DesignCalculator.cs)	(revision 2567)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesDesign/DesignCalculator.cs	(.../DesignCalculator.cs)	(revision 2575)
@@ -329,28 +329,13 @@
             }
 
             // Synchronize piping design parameters
-            if (designScenario.UpliftCriterionPiping.HasValue)
-            {
-                location.UpliftCriterionPiping = designScenario.UpliftCriterionPiping.Value;
-            }
-            if (designScenario.RequiredSafetyFactorPiping.HasValue)
-            {
-                location.ModelFactors.RequiredSafetyFactorPiping = designScenario.RequiredSafetyFactorPiping.Value;
-            }
+            location.UpliftCriterionPiping = designScenario.UpliftCriterionPiping;
+            location.ModelFactors.RequiredSafetyFactorPiping = designScenario.RequiredSafetyFactorPiping;
 
             // Synchronize stability design parameters
-            if (designScenario.UpliftCriterionStability.HasValue)
-            {
-                location.UpliftCriterionStability = designScenario.UpliftCriterionStability.Value;
-            }
-            if (designScenario.RequiredSafetyFactorStabilityInnerSlope.HasValue)
-            {
-                location.ModelFactors.RequiredSafetyFactorStabilityInnerSlope = designScenario.RequiredSafetyFactorStabilityInnerSlope.Value;
-            }
-            if (designScenario.RequiredSafetyFactorStabilityOuterSlope.HasValue)
-            {
-                location.ModelFactors.RequiredSafetyFactorStabilityOuterSlope = designScenario.RequiredSafetyFactorStabilityOuterSlope.Value;
-            }
+            location.UpliftCriterionStability = designScenario.UpliftCriterionStability;
+            location.ModelFactors.RequiredSafetyFactorStabilityInnerSlope = designScenario.RequiredSafetyFactorStabilityInnerSlope;
+            location.ModelFactors.RequiredSafetyFactorStabilityOuterSlope = designScenario.RequiredSafetyFactorStabilityOuterSlope;
             if (designScenario.DikeTableHeight.HasValue)
             {
                 location.DikeTableHeight = designScenario.DikeTableHeight ?? location.SurfaceLine.GetDefaultDikeTableHeight() ?? 0;