Index: dam clients/DamUI/trunk/src/Dam/Data/DamEngineIo/FillXmlInputFromDamUi.cs
===================================================================
diff -u -r552 -r560
--- dam clients/DamUI/trunk/src/Dam/Data/DamEngineIo/FillXmlInputFromDamUi.cs	(.../FillXmlInputFromDamUi.cs)	(revision 552)
+++ dam clients/DamUI/trunk/src/Dam/Data/DamEngineIo/FillXmlInputFromDamUi.cs	(.../FillXmlInputFromDamUi.cs)	(revision 560)
@@ -192,10 +192,10 @@
                     inputDesignScenario.PlLineOffsetBelowShoulderBaseInside = designScenario.PlLineOffsetBelowShoulderBaseInside ?? 0.0;
                     inputDesignScenario.PlLineOffsetBelowDikeToeAtPolderSpecified = designScenario.PlLineOffsetBelowDikeToeAtPolder.HasValue;
                     inputDesignScenario.PlLineOffsetBelowDikeToeAtPolder = designScenario.PlLineOffsetBelowDikeToeAtPolder ?? 0.0;
-                    inputDesignScenario.PlLineOffsetBelowDikeCrestMiddleSpecified = designScenario.UsePlLineOffsetBelowDikeCrestMiddle.Value;
-                    inputDesignScenario.PlLineOffsetBelowDikeCrestMiddle = designScenario.PlLineOffsetBelowDikeCrestMiddle.Value;
-                    inputDesignScenario.PlLineOffsetFactorBelowShoulderCrestSpecified = designScenario.UsePlLineOffsetFactorBelowShoulderCrest.Value;
-                    inputDesignScenario.PlLineOffsetFactorBelowShoulderCrest = designScenario.PlLineOffsetFactorBelowShoulderCrest.Value;
+                    inputDesignScenario.PlLineOffsetBelowDikeCrestMiddleSpecified = designScenario.UsePlLineOffsetBelowDikeCrestMiddle?? false;
+                    inputDesignScenario.PlLineOffsetBelowDikeCrestMiddle = designScenario.PlLineOffsetBelowDikeCrestMiddle ?? 0.0;
+                    inputDesignScenario.PlLineOffsetFactorBelowShoulderCrestSpecified = designScenario.UsePlLineOffsetFactorBelowShoulderCrest ?? false;
+                    inputDesignScenario.PlLineOffsetFactorBelowShoulderCrest = designScenario.PlLineOffsetFactorBelowShoulderCrest ?? 0.0;
                     inputDesignScenario.HeadPl3Specified = designScenario.HeadPl3.HasValue;
                     inputDesignScenario.HeadPl3 = designScenario.HeadPl3 ?? 0.0;
                     inputDesignScenario.HeadPl4Specified = designScenario.HeadPl4.HasValue;
Index: dam clients/DamUI/trunk/src/Dam/Data/Deltares.Dam.Data.csproj
===================================================================
diff -u -r506 -r560
--- dam clients/DamUI/trunk/src/Dam/Data/Deltares.Dam.Data.csproj	(.../Deltares.Dam.Data.csproj)	(revision 506)
+++ dam clients/DamUI/trunk/src/Dam/Data/Deltares.Dam.Data.csproj	(.../Deltares.Dam.Data.csproj)	(revision 560)
@@ -82,6 +82,10 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\lib\Authorization\x86\Deltares.Authorization.dll</HintPath>
     </Reference>
+    <Reference Include="Deltares.DamEngine.Data, Version=17.1.0.549, Culture=neutral, processorArchitecture=x86">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\lib\DamEngine\Deltares.DamEngine.Data.dll</HintPath>
+    </Reference>
     <Reference Include="Deltares.DamEngine.Io">
       <HintPath>..\..\..\lib\DamEngine\Deltares.DamEngine.Io.dll</HintPath>
     </Reference>
Index: dam clients/DamUI/trunk/src/Dam/Forms/Deltares.Dam.Forms.csproj
===================================================================
diff -u -r463 -r560
--- dam clients/DamUI/trunk/src/Dam/Forms/Deltares.Dam.Forms.csproj	(.../Deltares.Dam.Forms.csproj)	(revision 463)
+++ dam clients/DamUI/trunk/src/Dam/Forms/Deltares.Dam.Forms.csproj	(.../Deltares.Dam.Forms.csproj)	(revision 560)
@@ -49,6 +49,10 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\lib\DotSpatial.BrutileLayer\BruTile.Desktop.dll</HintPath>
     </Reference>
+    <Reference Include="Deltares.DamEngine.Data, Version=17.1.0.549, Culture=neutral, processorArchitecture=x86">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\lib\DamEngine\Deltares.DamEngine.Data.dll</HintPath>
+    </Reference>
     <Reference Include="Deltares.DamEngine.Interface">
       <HintPath>..\..\..\lib\DamEngine\Deltares.DamEngine.Interface.dll</HintPath>
     </Reference>
Index: dam clients/DamUI/trunk/src/Dam/Data/DamEngineIo/ConversionHelper.cs
===================================================================
diff -u -r531 -r560
--- dam clients/DamUI/trunk/src/Dam/Data/DamEngineIo/ConversionHelper.cs	(.../ConversionHelper.cs)	(revision 531)
+++ dam clients/DamUI/trunk/src/Dam/Data/DamEngineIo/ConversionHelper.cs	(.../ConversionHelper.cs)	(revision 560)
@@ -188,6 +188,17 @@
         {
             var translationTable = new Dictionary<CharacteristicPointType, int>()
                                                {
+                                                    // The following types do not have a meaning in DAM, so should be mapped to CpNone
+                                                    {CharacteristicPointType.BottomRiverChannel, CpNone},
+                                                    {CharacteristicPointType.InsertRiverChannel, CpNone},
+                                                    {CharacteristicPointType.ForelandStart, CpNone},
+                                                    {CharacteristicPointType.NonWaterRetainingObjectPoint1, CpNone},
+                                                    {CharacteristicPointType.NonWaterRetainingObjectPoint2, CpNone},
+                                                    {CharacteristicPointType.NonWaterRetainingObjectPoint3, CpNone},
+                                                    {CharacteristicPointType.NonWaterRetainingObjectPoint4, CpNone},
+                                                    {CharacteristicPointType.DunesBoundaryProfile, CpNone},
+                                                    {CharacteristicPointType.DunesTransectLocation, CpNone},
+                                                    // The following types are DAM related, so should be translated
                                                     {CharacteristicPointType.None, CpNone},
                                                     {CharacteristicPointType.SurfaceLevelOutside, CpSurfaceLevelOutside},
                                                     {CharacteristicPointType.DikeToeAtRiver, CpDikeToeAtRiver},
Index: dam clients/DamUI/trunk/src/Dam/Forms/DamPlugin.cs
===================================================================
diff -u -r533 -r560
--- dam clients/DamUI/trunk/src/Dam/Forms/DamPlugin.cs	(.../DamPlugin.cs)	(revision 533)
+++ dam clients/DamUI/trunk/src/Dam/Forms/DamPlugin.cs	(.../DamPlugin.cs)	(revision 560)
@@ -675,6 +675,10 @@
                 var damEnginInterface = new EngineInterface(inputXml);
                 string validationMessages = damEnginInterface.Validate();
                 string outputXml = damEnginInterface.Run();
+
+                // Next 2 lines for debugging
+                const string outputFilename = "OutputFile.xml";
+                File.WriteAllText(outputFilename, outputXml);
                
             }
             catch (Exception e)