Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillXmlInputFromDamUi.cs
===================================================================
diff -u -r2565 -r2570
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillXmlInputFromDamUi.cs	(.../FillXmlInputFromDamUi.cs)	(revision 2565)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillXmlInputFromDamUi.cs	(.../FillXmlInputFromDamUi.cs)	(revision 2570)
@@ -591,14 +591,10 @@
                     inputDesignScenario.RiverLevelLow = designScenario.RiverLevelLow ?? 0.0;
                     inputDesignScenario.DikeTableHeightSpecified = designScenario.DikeTableHeight.HasValue;
                     inputDesignScenario.DikeTableHeight = designScenario.DikeTableHeight ?? 0.0;
-                    inputDesignScenario.PlLineOffsetBelowDikeTopAtRiverSpecified = designScenario.PlLineOffsetBelowDikeTopAtRiver.HasValue;
-                    inputDesignScenario.PlLineOffsetBelowDikeTopAtRiver = designScenario.PlLineOffsetBelowDikeTopAtRiver ?? 0.0;
-                    inputDesignScenario.PlLineOffsetBelowDikeTopAtPolderSpecified = designScenario.PlLineOffsetBelowDikeTopAtPolder.HasValue;
-                    inputDesignScenario.PlLineOffsetBelowDikeTopAtPolder = designScenario.PlLineOffsetBelowDikeTopAtPolder ?? 0.0;
-                    inputDesignScenario.PlLineOffsetBelowShoulderBaseInsideSpecified = designScenario.PlLineOffsetBelowShoulderBaseInside.HasValue;
-                    inputDesignScenario.PlLineOffsetBelowShoulderBaseInside = designScenario.PlLineOffsetBelowShoulderBaseInside ?? 0.0;
-                    inputDesignScenario.PlLineOffsetBelowDikeToeAtPolderSpecified = designScenario.PlLineOffsetBelowDikeToeAtPolder.HasValue;
-                    inputDesignScenario.PlLineOffsetBelowDikeToeAtPolder = designScenario.PlLineOffsetBelowDikeToeAtPolder ?? 0.0;
+                    inputDesignScenario.PlLineOffsetBelowDikeTopAtRiver = designScenario.PlLineOffsetBelowDikeTopAtRiver.Value;
+                    inputDesignScenario.PlLineOffsetBelowDikeTopAtPolder = designScenario.PlLineOffsetBelowDikeTopAtPolder.Value;
+                    inputDesignScenario.PlLineOffsetBelowShoulderBaseInside = designScenario.PlLineOffsetBelowShoulderBaseInside.Value;
+                    inputDesignScenario.PlLineOffsetBelowDikeToeAtPolder = designScenario.PlLineOffsetBelowDikeToeAtPolder.Value;
                     inputDesignScenario.PlLineOffsetBelowDikeCrestMiddleSpecified = designScenario.UsePlLineOffsetBelowDikeCrestMiddle ?? false;
                     inputDesignScenario.PlLineOffsetBelowDikeCrestMiddle = designScenario.PlLineOffsetBelowDikeCrestMiddle ?? 0.0;
                     inputDesignScenario.PlLineOffsetFactorBelowShoulderCrestSpecified = designScenario.UsePlLineOffsetFactorBelowShoulderCrest ?? false;
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillDamUiFromXmlInput.cs
===================================================================
diff -u -r2565 -r2570
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillDamUiFromXmlInput.cs	(.../FillDamUiFromXmlInput.cs)	(revision 2565)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillDamUiFromXmlInput.cs	(.../FillDamUiFromXmlInput.cs)	(revision 2570)
@@ -424,10 +424,10 @@
                         designScenario.RiverLevel = inputLocationDesignScenario.RiverLevel;
                         designScenario.RiverLevelLow = (inputLocationDesignScenario.RiverLevelLowSpecified ? (double?)inputLocationDesignScenario.RiverLevelLow : null);
                         designScenario.DikeTableHeight = (inputLocationDesignScenario.DikeTableHeightSpecified ? (double?)inputLocationDesignScenario.DikeTableHeight : null);
-                        designScenario.PlLineOffsetBelowDikeTopAtRiver = (inputLocationDesignScenario.PlLineOffsetBelowDikeTopAtRiverSpecified ? (double?)inputLocationDesignScenario.PlLineOffsetBelowDikeTopAtRiver : null);
-                        designScenario.PlLineOffsetBelowDikeTopAtPolder = (inputLocationDesignScenario.PlLineOffsetBelowDikeTopAtPolderSpecified ? (double?)inputLocationDesignScenario.PlLineOffsetBelowDikeTopAtPolder : null);
-                        designScenario.PlLineOffsetBelowShoulderBaseInside = (inputLocationDesignScenario.PlLineOffsetBelowShoulderBaseInsideSpecified ? (double?)inputLocationDesignScenario.PlLineOffsetBelowShoulderBaseInside : null);
-                        designScenario.PlLineOffsetBelowDikeToeAtPolder = (inputLocationDesignScenario.PlLineOffsetBelowDikeToeAtPolderSpecified ? (double?)inputLocationDesignScenario.PlLineOffsetBelowDikeToeAtPolder : null);
+                        designScenario.PlLineOffsetBelowDikeTopAtRiver = inputLocationDesignScenario.PlLineOffsetBelowDikeTopAtRiver;
+                        designScenario.PlLineOffsetBelowDikeTopAtPolder = inputLocationDesignScenario.PlLineOffsetBelowDikeTopAtPolder;
+                        designScenario.PlLineOffsetBelowShoulderBaseInside = inputLocationDesignScenario.PlLineOffsetBelowShoulderBaseInside;
+                        designScenario.PlLineOffsetBelowDikeToeAtPolder = inputLocationDesignScenario.PlLineOffsetBelowDikeToeAtPolder;
                         designScenario.UsePlLineOffsetBelowDikeCrestMiddle = inputLocationDesignScenario.PlLineOffsetBelowDikeCrestMiddleSpecified;
                         designScenario.PlLineOffsetBelowDikeCrestMiddle = inputLocationDesignScenario.PlLineOffsetBelowDikeCrestMiddle;
                         designScenario.UsePlLineOffsetFactorBelowShoulderCrest = inputLocationDesignScenario.PlLineOffsetFactorBelowShoulderCrestSpecified;
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/IO/CombineImportedData.cs
===================================================================
diff -u -r2560 -r2570
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/IO/CombineImportedData.cs	(.../CombineImportedData.cs)	(revision 2560)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/IO/CombineImportedData.cs	(.../CombineImportedData.cs)	(revision 2570)
@@ -663,32 +663,27 @@
                         };
                         var locationRecord = LocationRecords.FirstOrDefault(l => l.LocationId == scenarioRecord.LocationId);
                         //hier de nieuwe waarden vastzetten (1 uit scenariorecord, 2 uit location halen etc.)
-                        scenario.PlLineOffsetBelowDikeToeAtPolder = scenarioRecord.PlLineOffsetBelowDikeToeAtPolder.HasValue ? 
-                            scenarioRecord.PlLineOffsetBelowDikeToeAtPolder : locationRecord.PlLineOffsetBelowDikeToeAtPolder;
-                        scenario.PlLineOffsetBelowDikeTopAtPolder = scenarioRecord.PlLineOffsetBelowDikeTopAtPolder.HasValue ? 
-                            scenarioRecord.PlLineOffsetBelowDikeTopAtPolder : locationRecord.PlLineOffsetBelowDikeTopAtPolder;
-                        scenario.PlLineOffsetBelowDikeTopAtRiver = scenarioRecord.PlLineOffsetBelowDikeTopAtRiver.HasValue ?
-                            scenarioRecord.PlLineOffsetBelowDikeTopAtRiver : locationRecord.PlLineOffsetBelowDikeTopAtRiver;
-                        scenario.PlLineOffsetBelowShoulderBaseInside = scenarioRecord.PlLineOffsetBelowShoulderBaseInside.HasValue ?
-                            scenarioRecord.PlLineOffsetBelowShoulderBaseInside : locationRecord.PlLineOffsetBelowShoulderBaseInside;
-                        scenario.PlLineOffsetBelowDikeCrestMiddle = scenarioRecord.PlLineOffsetBelowDikeCrestMiddle.HasValue ? 
-                            scenarioRecord.PlLineOffsetBelowDikeCrestMiddle : locationRecord.PlLineOffsetBelowDikeCrestMiddle;
-                        scenario.PlLineOffsetFactorBelowShoulderCrest = scenarioRecord.PlLineOffsetFactorBelowShoulderCrest.HasValue ? 
-                            scenarioRecord.PlLineOffsetFactorBelowShoulderCrest : locationRecord.PlLineOffsetFactorBelowShoulderCrest;
-                        scenario.UsePlLineOffsetBelowDikeCrestMiddle = scenarioRecord.UsePlLineOffsetBelowDikeCrestMiddle.HasValue ?
-                            scenarioRecord.UsePlLineOffsetBelowDikeCrestMiddle : locationRecord.UsePlLineOffsetBelowDikeCrestMiddle;
-                        scenario.UsePlLineOffsetFactorBelowShoulderCrest = scenarioRecord.UsePlLineOffsetFactorBelowShoulderCrest.HasValue ?
-                            scenarioRecord.UsePlLineOffsetFactorBelowShoulderCrest : locationRecord.UsePlLineOffsetFactorBelowShoulderCrest;
-                        scenario.HeadPl3 = scenarioRecord.HeadPl3.HasValue ?
-                            scenarioRecord.HeadPl3 : locationRecord.HeadPl3;
-                        scenario.HeadPl4 = scenarioRecord.HeadPl4.HasValue ?
-                            scenarioRecord.HeadPl4 : locationRecord.HeadPl4;
-                        scenario.DikeTableHeight = scenarioRecord.DikeTableHeight.HasValue ?
-                            scenarioRecord.DikeTableHeight : locationRecord.DikeTableHeight;
-                        scenario.RiverLevel = scenarioRecord.RiverLevel.HasValue ?
-                            scenarioRecord.RiverLevel : locationRecord.RiverLevel;
-                        scenario.RiverLevelLow = scenarioRecord.RiverLevelLow.HasValue ?
-                            scenarioRecord.RiverLevelLow : locationRecord.RiverLevelLow;
+                        scenario.PlLineOffsetBelowDikeToeAtPolder = scenarioRecord.PlLineOffsetBelowDikeToeAtPolder ?? 
+                            (locationRecord.PlLineOffsetBelowDikeToeAtPolder ?? 0.0);
+                        scenario.PlLineOffsetBelowDikeTopAtPolder = scenarioRecord.PlLineOffsetBelowDikeTopAtPolder ?? 
+                            (locationRecord.PlLineOffsetBelowDikeTopAtPolder ?? 0.0);
+                        scenario.PlLineOffsetBelowDikeTopAtRiver = scenarioRecord.PlLineOffsetBelowDikeTopAtRiver ??
+                            (locationRecord.PlLineOffsetBelowDikeTopAtRiver ?? 0.0);
+                        scenario.PlLineOffsetBelowShoulderBaseInside = scenarioRecord.PlLineOffsetBelowShoulderBaseInside ??
+                            (locationRecord.PlLineOffsetBelowShoulderBaseInside ?? 0.0);
+                        scenario.PlLineOffsetBelowDikeCrestMiddle = scenarioRecord.PlLineOffsetBelowDikeCrestMiddle ?? 
+                            locationRecord.PlLineOffsetBelowDikeCrestMiddle;
+                        scenario.PlLineOffsetFactorBelowShoulderCrest = scenarioRecord.PlLineOffsetFactorBelowShoulderCrest ?? 
+                            locationRecord.PlLineOffsetFactorBelowShoulderCrest;
+                        scenario.UsePlLineOffsetBelowDikeCrestMiddle = scenarioRecord.UsePlLineOffsetBelowDikeCrestMiddle ?? 
+                            locationRecord.UsePlLineOffsetBelowDikeCrestMiddle;
+                        scenario.UsePlLineOffsetFactorBelowShoulderCrest = scenarioRecord.UsePlLineOffsetFactorBelowShoulderCrest ?? 
+                            locationRecord.UsePlLineOffsetFactorBelowShoulderCrest;
+                        scenario.HeadPl3 = scenarioRecord.HeadPl3 ?? locationRecord.HeadPl3;
+                        scenario.HeadPl4 = scenarioRecord.HeadPl4 ?? locationRecord.HeadPl4;
+                        scenario.DikeTableHeight = scenarioRecord.DikeTableHeight ?? locationRecord.DikeTableHeight;
+                        scenario.RiverLevel = scenarioRecord.RiverLevel ?? locationRecord.RiverLevel;
+                        scenario.RiverLevelLow = scenarioRecord.RiverLevelLow ?? locationRecord.RiverLevelLow;
                         
                         dikeLocation.Scenarios.Add(scenario);
                     }