Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/ConversionHelper.cs
===================================================================
diff -u -r4168 -r4195
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/ConversionHelper.cs	(.../ConversionHelper.cs)	(revision 4168)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/ConversionHelper.cs	(.../ConversionHelper.cs)	(revision 4195)
@@ -19,6 +19,7 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
+using System;
 using System.Collections.Generic;
 using Deltares.DamEngine.Io.XmlInput;
 using Deltares.DamEngine.Io.XmlOutput;
@@ -1349,15 +1350,15 @@
         var translationTable = new Dictionary<string, ShearStrengthModel>
         {
             {
-                "C phi", ShearStrengthModel.CPhi
+                "CPhi", ShearStrengthModel.CPhi
             },
             {
-                "Su calculated", ShearStrengthModel.CuCalculated
+                "CuCalculated", ShearStrengthModel.CuCalculated
             }
         };
-        if ((shearStrengthModel != "C phi") && (shearStrengthModel != "Su calculated"))
+        if ((shearStrengthModel != "CPhi") && (shearStrengthModel != "CuCalculated"))
         {
-            shearStrengthModel = "C phi";
+            throw new NotImplementedException();
         }
         return translationTable[shearStrengthModel];
     }    
Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DamEngineIo/ConversionHelperTests.cs
===================================================================
diff -u -r4168 -r4195
--- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DamEngineIo/ConversionHelperTests.cs	(.../ConversionHelperTests.cs)	(revision 4168)
+++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DamEngineIo/ConversionHelperTests.cs	(.../ConversionHelperTests.cs)	(revision 4195)
@@ -19,6 +19,7 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
+using System;
 using Deltares.Dam.Data;
 using Deltares.Dam.Data.DamEngineIo;
 using Deltares.DamEngine.Io.XmlInput;
@@ -592,17 +593,22 @@
         Assert.That(ConversionHelper.ConvertToSoilType(inputSoilType), Is.EqualTo(expectedSoilType));
     }
 
-    [TestCase("None", ShearStrengthModel.CPhi)]
-    [TestCase("C phi", ShearStrengthModel.CPhi)]
-    [TestCase("Stress table", ShearStrengthModel.CPhi)]
-    [TestCase("Pseudo values", ShearStrengthModel.CPhi)]
-    [TestCase("Su measured", ShearStrengthModel.CPhi)]
-    [TestCase("Su calculated", ShearStrengthModel.CuCalculated)]
-    [TestCase("Su gradient", ShearStrengthModel.CPhi)]
-    [TestCase("Su calculated with yield", ShearStrengthModel.CPhi)]
-    [TestCase("C phi or Su calculated", ShearStrengthModel.CPhi)]
+    [TestCase("CPhi", ShearStrengthModel.CPhi)]
+    [TestCase("CuCalculated", ShearStrengthModel.CuCalculated)]
     public void CanConvertToShearStrengthModel(string inputSoilType, ShearStrengthModel expectedSoilType)
     {
         Assert.That(ConversionHelper.ConvertToShearStrengthModel(inputSoilType), Is.EqualTo(expectedSoilType));
     }
+    
+    [TestCase("None")]
+    [TestCase("Stress table")]
+    [TestCase("Pseudo values")]
+    [TestCase("Su measured")]
+    [TestCase("Su gradient")]
+    [TestCase("Su calculated with yield")]
+    [TestCase("C phi or Su calculated")]
+    public void WhenInvalidInputSoilType_ThenConvertToShearStrengthModelThrowsException(string inputSoilType)
+    {
+        Assert.That(() => ConversionHelper.ConvertToShearStrengthModel(inputSoilType), Throws.InstanceOf<NotImplementedException>());
+    }
 }
\ No newline at end of file
Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/CsvImporterTestsNew.cs
===================================================================
diff -u -r4178 -r4195
--- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/CsvImporterTestsNew.cs	(.../CsvImporterTestsNew.cs)	(revision 4178)
+++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/CsvImporterTestsNew.cs	(.../CsvImporterTestsNew.cs)	(revision 4195)
@@ -914,9 +914,9 @@
     {
         using StreamWriter writer = File.CreateText(filePath);
         writer.WriteLine("soil_name;soil_color;soil_type;saturated_unit_weight;unsaturated_unit_weight;cohesion;friction_angle;diameter_d70;permeability_x;shear_strength_model;strength_increase_exponent;ratio_su_pc;use_pop;pop");
-        writer.WriteLine("Zand;#A6EBFC;Sand;20.000;18.000;0.000;30.000;210.00;0.001;None;0.700;0.220;False;10.000");
-        writer.WriteLine("Klei;#FFFFFF;Clay;17.500;17.500;3.500;18.500;210.00;0.001;C phi;0.700;0.220;False;10.000");
-        writer.WriteLine("Veen;#A4FFA6;Peat;11.000;11.000;2.000;20.500;210.00;0.001;Su calculated;0.700;0.220;False;10.000");
+        writer.WriteLine("Zand;#A6EBFC;Sand;20.000;18.000;0.000;30.000;210.00;0.001;CPhi;0.700;0.220;False;10.000");
+        writer.WriteLine("Klei;#FFFFFF;Clay;17.500;17.500;3.500;18.500;210.00;0.001;CPhi;0.700;0.220;False;10.000");
+        writer.WriteLine("Veen;#A4FFA6;Peat;11.000;11.000;2.000;20.500;210.00;0.001;CuCalculated;0.700;0.220;False;10.000");
     }
 
     private static void CreateMinimalSoilsFile(string filePath)