Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/CsvImporters/CsvImporterLocations.cs
===================================================================
diff -u -r2468 -r2471
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/CsvImporters/CsvImporterLocations.cs	(.../CsvImporterLocations.cs)	(revision 2468)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/CsvImporters/CsvImporterLocations.cs	(.../CsvImporterLocations.cs)	(revision 2471)
@@ -136,7 +136,7 @@
                 using (var csv = new CsvReader(new StreamReader(fileName), true, ';'))
                 {
                     string[] headers = CsvImporterHelper.GetFieldHeaders(this, csv);
-                    if (headers.Count() < 4)
+                    if (headers.Count() < 3)
                     {
                         var csvHeaderError = LocalizationManager.GetTranslatedText(this.GetType(), "csvHeaderError");
                         throw new CsvImporterSegmentsException(String.Format("{0} : {1}", fileName, csvHeaderError));
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/CsvImporters/CsvImporterScenarios.cs
===================================================================
diff -u -r2468 -r2471
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/CsvImporters/CsvImporterScenarios.cs	(.../CsvImporterScenarios.cs)	(revision 2468)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/CsvImporters/CsvImporterScenarios.cs	(.../CsvImporterScenarios.cs)	(revision 2471)
@@ -130,7 +130,7 @@
                 using (CsvReader csv = new CsvReader(new StreamReader(fileName), true, ';'))
                 {
                     string[] headers = CsvImporterHelper.GetFieldHeaders(this, csv);
-                    if (headers.Count() < 4)
+                    if (headers.Count() < 2)
                     {
                         var csvHeaderError = LocalizationManager.GetTranslatedText(this.GetType(), "csvHeaderError");
                         throw new CsvImporterSegmentsException(String.Format("{0} : {1}", fileName, csvHeaderError));                        
@@ -146,11 +146,8 @@
 
                     int colIndexWaterHeight = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.WaterHeightColumnName);
                     int colIndexWaterHeightLow = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.WaterHeightLowColumnName);
+                    int colIndexDikeTableHeight = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.DikeTableHeightColumnName);
 
-                    const string fieldDikeTableHeight = CsvColumnNames.DikeTableHeightColumnName;
-                    int colIndexDikeTableHeight = CsvReaderUtilities.GetHeaderIndexByString(headers, fieldDikeTableHeight);
-                    CheckColumn(colIndexDikeTableHeight, fileName, fieldDikeTableHeight);
-
                     int colIndexSafetyFactorPiping = CsvReaderUtilities.GetHeaderIndexByString(headers, ModelFactorCsvIdentifiers.SafetyFactorPiping);
                     int colIndexSafetyFactorStabilityInnerSlope = CsvReaderUtilities.GetHeaderIndexByString(headers, ModelFactorCsvIdentifiers.SafetyFactorStabilityInnerslope);
                     int colIndexSafetyFactorStabilityOuterSlope = CsvReaderUtilities.GetHeaderIndexByString(headers, ModelFactorCsvIdentifiers.SafetyFactorStabilityOuterslope);
@@ -201,8 +198,11 @@
                             {
                                 scenario.WaterHeightLow = scenario.WaterHeight;
                             }
-                            colIndex = colIndexDikeTableHeight;
-                            scenario.DikeTableHeight = Convert.ToDouble(csv[colIndexDikeTableHeight]);
+                            if (colIndexDikeTableHeight > -1)
+                            {
+                                colIndex = colIndexDikeTableHeight;
+                                scenario.DikeTableHeight = Convert.ToDouble(csv[colIndexDikeTableHeight]);
+                            }
                             if (colIndexSafetyFactorPiping > -1)
                             {
                                 colIndex = colIndexSafetyFactorPiping;
Index: DamClients/DamUI/trunk/src/Dam/Tests/DataPluginImporterTests.cs
===================================================================
diff -u -r2470 -r2471
--- DamClients/DamUI/trunk/src/Dam/Tests/DataPluginImporterTests.cs	(.../DataPluginImporterTests.cs)	(revision 2470)
+++ DamClients/DamUI/trunk/src/Dam/Tests/DataPluginImporterTests.cs	(.../DataPluginImporterTests.cs)	(revision 2471)
@@ -243,7 +243,7 @@
 
         private void CreateLocationsFileWithWaterHeight(string importFile)
         {
-            // A valid locations.csv has at least 4 columns.
+            // A valid locations.csv has at least 3 columns.
             // Required are location_id, surfaceline_id, segment_id.
             // For the test we need dikering_id as well.
             // Include column for WaterHeight
@@ -259,45 +259,45 @@
 
         private void CreateLocationsFileWithoutWaterHeight(string importFile)
         {
-            // A valid locations.csv has at least 4 columns
+            // A valid locations.csv has at least 3 columns
             // Do NOT include column for WaterHeight
             if (File.Exists(importFile))
                 File.Delete(importFile);
             using (var writer = File.CreateText(importFile))
             {
-                writer.WriteLine("location_id;surfaceline_id;segment_id;polderlevel");
-                writer.WriteLine("RK210-560;Actualisatie;1;1.2");
-                writer.WriteLine("RK210-570;Actualisatie;1;2.2");
+                writer.WriteLine("location_id;dikering_id;surfaceline_id;segment_id;polderlevel");
+                writer.WriteLine("RK210-560;Actualisatie;RK210-560;1;1.2");
+                writer.WriteLine("RK210-570;Actualisatie;RK210-570;1;2.2");
             }
         }
 
         private void CreateScenariosFileWithWaterHeight(string importFile)
         {
-            // A valid scenarios.csv has at least 4 columns
-            // Required are location_id, location_scenario_id, water_height and dike_table_height.
+            // A valid scenarios.csv has at least 2 columns
+            // Required are location_id, location_scenario_id, 
             // Include column for WaterHeight
             if (File.Exists(importFile))
                 File.Delete(importFile);
             using (var writer = File.CreateText(importFile))
             {
-                writer.WriteLine("location_id;location_scenario_id;water_height;dike_table_height");
-                writer.WriteLine("RK210-560;1;0.1;0.680");
-                writer.WriteLine("RK210-570;1;0.2;1.680");
+                writer.WriteLine("location_id;location_scenario_id;water_height");
+                writer.WriteLine("RK210-560;1;0.1");
+                writer.WriteLine("RK210-570;1;0.2");
             }
         }
 
         private void CreateScenariosFileWithoutWaterHeight(string importFile)
         {
-            // A valid scenarios.csv has at least 4 columns
+            // A valid scenarios.csv has at least 2 columns
             // Required are location_id, location_scenario_id, water_height and dike_table_height.
-            // Include column for WaterHeight
+            // Do NOT include column for WaterHeight
             if (File.Exists(importFile))
                 File.Delete(importFile);
             using (var writer = File.CreateText(importFile))
             {
-                writer.WriteLine("location_id;location_scenario_id;HeadPL3;dike_table_height");
-                writer.WriteLine("RK210-560;1;0.1;0.680");
-                writer.WriteLine("RK210-570;1;0.2;1.680");
+                writer.WriteLine("location_id;location_scenario_id");
+                writer.WriteLine("RK210-560;1");
+                writer.WriteLine("RK210-570;1");
             }
         }