Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/DikesDesign/SurfaceLineHeightAdapterTest.cs
===================================================================
diff -u -r3520 -r3875
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/DikesDesign/SurfaceLineHeightAdapterTest.cs	(.../SurfaceLineHeightAdapterTest.cs)	(revision 3520)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/DikesDesign/SurfaceLineHeightAdapterTest.cs	(.../SurfaceLineHeightAdapterTest.cs)	(revision 3875)
@@ -984,7 +984,6 @@
         }
 
         [Test]
-        [ExpectedException(typeof(SurfaceLineAdapterException))]
         public void HeightAdaptionThrowsExceptionIfSurfaceLineIsNotLongEnough()
         {
             var surfaceLine = FactoryForSurfaceLines.CreateRealisticSurfaceLineForHeightAdapter();
@@ -993,8 +992,7 @@
             var pointSurfaceLevelInside = new GeometryPoint { X = 40, Z = 12 }; // Set surfacelevelinside just beside ditch to force exception
             surfaceLine.EnsurePointOfType(pointSurfaceLevelInside.X, pointSurfaceLevelInside.Z, CharacteristicPointType.SurfaceLevelInside);
             var surfaceLineAdapter = new SurfaceLineHeightAdapter(surfaceLine, location, 0);
-            var newSurfaceLine = surfaceLineAdapter.ConstructNewSurfaceLine(newDikeHeight);
-            Assert.Null(newSurfaceLine);
+            Assert.That(() => surfaceLineAdapter.ConstructNewSurfaceLine(newDikeHeight), Throws.InstanceOf<SurfaceLineAdapterException>());
         }
 
         /// <summary>