Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillDamUiFromXmlInput.cs
===================================================================
diff -u -r2578 -r2803
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillDamUiFromXmlInput.cs	(.../FillDamUiFromXmlInput.cs)	(revision 2578)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillDamUiFromXmlInput.cs	(.../FillDamUiFromXmlInput.cs)	(revision 2803)
@@ -401,11 +401,9 @@
                 location.XSoilGeometry2DOrigin = inputLocation.XSoilGeometry2DOrigin;
                 location.PLLineCreationMethod = ConversionHelper.ConvertToPhreaticLineCreationMethod(waternetOptions.PhreaticLineCreationMethod);
                 location.IntrusionVerticalWaterPressure = ConversionHelper.ConvertToIntrusionVerticalWaterPressure(waternetOptions.IntrusionVerticalWaterPressure);
-                location.PolderLevel = waternetOptions.PolderLevel;
                 location.DampingFactorPL3 = waternetOptions.DampingFactorPl3;
                 location.DampingFactorPL4 = waternetOptions.DampingFactorPl4;
                 location.PenetrationLength = waternetOptions.PenetrationLength;
-                location.HeadPL2 = (waternetOptions.HeadPl2Specified ? (double?)waternetOptions.HeadPl2 : null);
                 location.SlopeDampingPiezometricHeightPolderSide = waternetOptions.SlopeDampingFactor;
                 
                 SurfaceLine2 surfaceLine = dikeSurfaceLines.First(n => n.Name.Equals(inputLocation.SurfaceLineName));
@@ -439,7 +437,8 @@
                         designScenario.RequiredSafetyFactorStabilityInnerSlope = inputLocationDesignScenario.RequiredSafetyFactorStabilityInnerSlope;
                         designScenario.RequiredSafetyFactorStabilityOuterSlope = inputLocationDesignScenario.RequiredSafetyFactorStabilityOuterSlope;
                         designScenario.RequiredSafetyFactorPiping = inputLocationDesignScenario.RequiredSafetyFactorPiping;
-
+                        designScenario.PolderLevel = inputLocationDesignScenario.PolderLevel;
+                        designScenario.HeadPl2 = (inputLocationDesignScenario.HeadPl2Specified ? (double?)inputLocationDesignScenario.HeadPl2 : null);
                         location.Scenarios.Add(designScenario);
                     }
                 }
Index: DamClients/DamUI/trunk/src/Dam/Tests/IO/CombineImportedDataTest.cs
===================================================================
diff -u -r2798 -r2803
--- DamClients/DamUI/trunk/src/Dam/Tests/IO/CombineImportedDataTest.cs	(.../CombineImportedDataTest.cs)	(revision 2798)
+++ DamClients/DamUI/trunk/src/Dam/Tests/IO/CombineImportedDataTest.cs	(.../CombineImportedDataTest.cs)	(revision 2803)
@@ -250,7 +250,7 @@
                     1.08,
                     1.45
                 }, scenarios.Select(sc => sc.RequiredSafetyFactorStabilityInnerSlope));
-                Assert.IsTrue(scenarios.All(sc => Math.Abs(sc.PolderLevel.Value + 0.25) < tolerance));
+                Assert.IsTrue(scenarios.All(sc => Math.Abs(sc.PolderLevel + 0.25) < tolerance));
                 Assert.IsTrue(scenarios.All(sc => Math.Abs(sc.HeadPl2.Value - 0.8727) < tolerance));
             }
         }
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/IO/CombineImportedData.cs
===================================================================
diff -u -r2798 -r2803
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/IO/CombineImportedData.cs	(.../CombineImportedData.cs)	(revision 2798)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/IO/CombineImportedData.cs	(.../CombineImportedData.cs)	(revision 2803)
@@ -686,7 +686,7 @@
                             locationRecord.UsePlLineOffsetFactorBelowShoulderCrest;
                         scenario.HeadPl3 = scenarioRecord.HeadPl3 ?? locationRecord.HeadPl3;
                         scenario.HeadPl4 = scenarioRecord.HeadPl4 ?? locationRecord.HeadPl4;
-                        scenario.PolderLevel = scenarioRecord.PolderLevel ?? locationRecord.PolderLevel;
+                        scenario.PolderLevel = scenarioRecord.PolderLevel ?? locationRecord.PolderLevel ?? scenario.PolderLevel;
                         scenario.HeadPl2 = scenarioRecord.HeadPl2 ?? locationRecord.HeadPl2;
                         scenario.DikeTableHeight = scenarioRecord.DikeTableHeight ?? locationRecord.DikeTableHeight;
                         scenario.RiverLevel = scenarioRecord.RiverLevel ?? locationRecord.RiverLevel;
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Scenario.cs
===================================================================
diff -u -r2790 -r2803
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Scenario.cs	(.../Scenario.cs)	(revision 2790)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Scenario.cs	(.../Scenario.cs)	(revision 2803)
@@ -114,7 +114,7 @@
         private double? plLineOffsetFactorBelowShoulderCrest;
         private double? headPl3;
         private double? headPl4;
-        private double? polderLevel;
+        private double polderLevel;
         private double? headPl2;
 
         [Browsable(false)]
@@ -279,7 +279,7 @@
         [PropertyOrder(1, 4)]
         [Unit(UnitType.Length)]
         [Format("F2")]
-        public double? PolderLevel
+        public double PolderLevel
         {
             get
             {
@@ -1005,7 +1005,7 @@
                                      PlLineOffsetFactorBelowShoulderCrest.Value.ToString(CultureInfo.InvariantCulture) : "?",
                                  HeadPl3.HasValue ? HeadPl3.Value.ToString(CultureInfo.InvariantCulture) : "?",
                                  HeadPl4.HasValue ? HeadPl4.Value.ToString(CultureInfo.InvariantCulture) : "?",
-                                 PolderLevel.HasValue ? PolderLevel.Value.ToString(CultureInfo.InvariantCulture) : "?",
+                                 PolderLevel.ToString(CultureInfo.InvariantCulture),
                                  HeadPl2.HasValue ? HeadPl2.Value.ToString(CultureInfo.InvariantCulture) : "?");
         }
 
@@ -1063,11 +1063,8 @@
             {
                 nameValuePairs.Add(ScenarioParameterNames.HeadPl4, HeadPl4.Value.ToString(numberFormatInfo));
             }
-            if (PolderLevel != null)
-            {
-                nameValuePairs.Add(ScenarioParameterNames.PolderLevel, PolderLevel.Value.ToString(numberFormatInfo));
-            }
-
+            nameValuePairs.Add(ScenarioParameterNames.PolderLevel, PolderLevel.ToString(numberFormatInfo));
+            
             if (HeadPl2 != null)
             {
                 nameValuePairs.Add(ScenarioParameterNames.HeadPl2, HeadPl2.Value.ToString(numberFormatInfo));
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillXmlInputFromDamUi.cs
===================================================================
diff -u -r2645 -r2803
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillXmlInputFromDamUi.cs	(.../FillXmlInputFromDamUi.cs)	(revision 2645)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillXmlInputFromDamUi.cs	(.../FillXmlInputFromDamUi.cs)	(revision 2803)
@@ -549,12 +549,9 @@
                 var waternetOptions = new LocationWaternetOptions();
                 waternetOptions.PhreaticLineCreationMethod = ConversionHelper.ConvertToInputPhreaticLineCreationMethod(location.PLLineCreationMethod);
                 waternetOptions.IntrusionVerticalWaterPressure = ConversionHelper.ConvertToInputIntrusionVerticalWaterPressure(location.IntrusionVerticalWaterPressure ?? IntrusionVerticalWaterPressureType.Standard);
-                waternetOptions.PolderLevel = location.PolderLevel;
                 waternetOptions.DampingFactorPl3 = location.DampingFactorPL3;
                 waternetOptions.DampingFactorPl4 = location.DampingFactorPL4;
                 waternetOptions.PenetrationLength = location.PenetrationLength;
-                waternetOptions.HeadPl2Specified = location.HeadPL2.HasValue;
-                waternetOptions.HeadPl2 = location.HeadPL2 ?? 0.0;
                 waternetOptions.SlopeDampingFactor = location.SlopeDampingPiezometricHeightPolderSide;
                 inputLocation.WaternetOptions = waternetOptions;
 
@@ -587,6 +584,9 @@
                     inputDesignScenario.RequiredSafetyFactorStabilityInnerSlope = designScenario.RequiredSafetyFactorStabilityInnerSlope;
                     inputDesignScenario.RequiredSafetyFactorStabilityOuterSlope = designScenario.RequiredSafetyFactorStabilityOuterSlope;
                     inputDesignScenario.RequiredSafetyFactorPiping = designScenario.RequiredSafetyFactorPiping;
+                    inputDesignScenario.PolderLevel = designScenario.PolderLevel;
+                    inputDesignScenario.HeadPl2Specified = designScenario.HeadPl2.HasValue;
+                    inputDesignScenario.HeadPl2 = designScenario.HeadPl2 ?? 0.0;
 
                     inputLocation.DesignScenarios[j] = inputDesignScenario;
                 }
Index: DamClients/DamUI/trunk/src/Dam/Tests/ScenarioTest.cs
===================================================================
diff -u -r2790 -r2803
--- DamClients/DamUI/trunk/src/Dam/Tests/ScenarioTest.cs	(.../ScenarioTest.cs)	(revision 2790)
+++ DamClients/DamUI/trunk/src/Dam/Tests/ScenarioTest.cs	(.../ScenarioTest.cs)	(revision 2803)
@@ -41,7 +41,7 @@
             Assert.IsInstanceOf<IVisibleEnabled>(scenario);
             Assert.IsInstanceOf<IRepairer>(scenario);
 
-            Assert.IsNull(scenario.PolderLevel);
+            Assert.AreEqual(0, scenario.PolderLevel);
             Assert.IsNull(scenario.HeadPl2);
         }
 
@@ -65,7 +65,7 @@
             const string variableName = "PolderLevel";
             Assert.IsTrue(pairs.ContainsKey(variableName));
             string pairValue = pairs[variableName];
-            string expectedValue = scenario.PolderLevel.Value.ToString(new NumberFormatInfo
+            string expectedValue = scenario.PolderLevel.ToString(new NumberFormatInfo
             {
                 NumberDecimalSeparator = "."
             });
@@ -78,9 +78,6 @@
             // Given
             var scenario = new Scenario();
 
-            // Precondition
-            Assert.IsNull(scenario.PolderLevel);
-
             // When
             var pairs = scenario.GetParametersAsNameValuePairs();
 
@@ -103,9 +100,6 @@
 
             var scenario = new Scenario();
 
-            // Precondition
-            Assert.IsNull(scenario.PolderLevel);
-
             // Call
             scenario.SetParameterFromNameValuePair(polderLevelName, stringValue);