Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/PlLinesToWaternetConverterTests.cs
===================================================================
diff -u -r3520 -r3875
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/PlLinesToWaternetConverterTests.cs	(.../PlLinesToWaternetConverterTests.cs)	(revision 3520)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/PlLinesToWaternetConverterTests.cs	(.../PlLinesToWaternetConverterTests.cs)	(revision 3875)
@@ -1342,40 +1342,36 @@
         }
 
         [Test]
-        [ExpectedException(typeof(NoNullAllowedException), ExpectedMessage = "Geen ondergrond profiel gedefinieerd")]
         [SetUICulture("nl-NL")]
         public void TestLanguageNLThrowsExceptionWhenSoilProfile1DIsNull()
         {
             var plLines = new PlLines();
-            PlLinesToWaternetConverter.ConvertPlLineToWaternet(plLines,null, 0, 0, 0);
+            Assert.That(() => PlLinesToWaternetConverter.ConvertPlLineToWaternet(plLines,null, 0, 0, 0), Throws.InstanceOf<NoNullAllowedException>().With.Message.EqualTo("Geen ondergrond profiel gedefinieerd"));
         }
 
         [Test]
-        [ExpectedException(typeof(NoNullAllowedException), ExpectedMessage = "Geen object voor pn-lijnen gedefinieerd")]
         [SetUICulture("nl-NL")]
         public void TestLanguageNLThrowsExceptionWhenPlLinesIsNull()
         {
             var soilProfile1D = new SoilProfile1D();
-            PlLinesToWaternetConverter.ConvertPlLineToWaternet(null, soilProfile1D, 0, 0, 0);
+            Assert.That(() => PlLinesToWaternetConverter.ConvertPlLineToWaternet(null, soilProfile1D, 0, 0, 0), Throws.InstanceOf<NoNullAllowedException>().With.Message.EqualTo("Geen object voor pn-lijnen gedefinieerd"));
         }
 
 
         [Test]
-        [ExpectedException(typeof(NoNullAllowedException), ExpectedMessage = "Geen ondergrond profiel gedefinieerd")]
         [SetUICulture("nl-NL")]
         public void ConvertPlLineToWaternet_SoilProfileNull_ThrowsException()
         {
             var plLines = new PlLines();
-            PlLinesToWaternetConverter.ConvertPlLineToWaternet(plLines, null, 0);
+            Assert.That(() => PlLinesToWaternetConverter.ConvertPlLineToWaternet(plLines, null, 0), Throws.InstanceOf<NoNullAllowedException>().With.Message.EqualTo("Geen ondergrond profiel gedefinieerd"));
         }
 
         [Test]
-        [ExpectedException(typeof(NoNullAllowedException), ExpectedMessage = "Geen object voor pn-lijnen gedefinieerd")]
         [SetUICulture("nl-NL")]
         public void ConvertPlLineToWaternet_ProfileLinesNull_ThrowsException()
         {
             var soilProfile = new SoilProfile2D();
-            PlLinesToWaternetConverter.ConvertPlLineToWaternet(null, soilProfile, 0);
+            Assert.That(() => PlLinesToWaternetConverter.ConvertPlLineToWaternet(null, soilProfile, 0), Throws.InstanceOf<NoNullAllowedException>().With.Message.EqualTo("Geen object voor pn-lijnen gedefinieerd"));
         }