Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Read/SurfaceLineEntityReadExtensions.cs
===================================================================
diff -u -r091da501e5dd61cf05b94c4d4f075c1e73b3d950 -r00e33c83f9799a2e2a0c00d7c93a0a9557701b0e
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Read/SurfaceLineEntityReadExtensions.cs	(.../SurfaceLineEntityReadExtensions.cs)	(revision 091da501e5dd61cf05b94c4d4f075c1e73b3d950)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Read/SurfaceLineEntityReadExtensions.cs	(.../SurfaceLineEntityReadExtensions.cs)	(revision 00e33c83f9799a2e2a0c00d7c93a0a9557701b0e)
@@ -48,6 +48,10 @@
         /// <exception cref="ArgumentNullException">Thrown when any input parameter is <c>null</c>.</exception>
         /// <exception cref="ArgumentException">Thrown when <see cref="SurfaceLineEntity.PointsXml"/> 
         /// of <paramref name="entity"/> is empty.</exception>
+        /// <exception cref="InvalidEnumArgumentException">Thrown when the <paramref name="entity"/> 
+        /// contains an invalid type of characteristic point.</exception>
+        /// <exception cref="NotSupportedException">Thrown when the <paramref name="entity"/> contains a 
+        /// characteristic point that is not supported.</exception>
         public static PipingSurfaceLine ReadAsPipingSurfaceLine(this SurfaceLineEntity entity,
                                                                 ReadConversionCollector collector)
         {
@@ -89,6 +93,10 @@
         /// <exception cref="ArgumentNullException">Thrown when any input parameter is <c>null</c>.</exception>
         /// <exception cref="ArgumentException">Thrown when <see cref="SurfaceLineEntity.PointsXml"/> 
         /// of <paramref name="entity"/> is empty.</exception>
+        /// <exception cref="InvalidEnumArgumentException">Thrown when the <paramref name="entity"/> 
+        /// contains an invalid type of characteristic point.</exception>
+        /// <exception cref="NotSupportedException">Thrown when the <paramref name="entity"/> contains a 
+        /// characteristic point that is not supported.</exception>
         public static MacroStabilityInwardsSurfaceLine ReadAsMacroStabilityInwardsSurfaceLine(
             this SurfaceLineEntity entity,
             ReadConversionCollector collector)
@@ -126,6 +134,16 @@
                                entity.ReferenceLineIntersectionY.ToNullAsNaN());
         }
 
+        /// <summary>
+        /// Reads the characteristic points from the <paramref name="entity"/> and sets these 
+        /// to the <paramref name="surfaceLine"/>.
+        /// </summary>
+        /// <param name="entity">The entity to read.</param>
+        /// <param name="surfaceLine">The surface line to set the characteristic point on.</param>
+        /// <exception cref="InvalidEnumArgumentException">Thrown when the <paramref name="entity"/> 
+        /// contains an invalid type of characteristic point.</exception>
+        /// <exception cref="NotSupportedException">Thrown when the <paramref name="entity"/> contains a 
+        /// characteristic point that is not supported.</exception>
         private static void ReadCharacteristicPoints(this SurfaceLineEntity entity, PipingSurfaceLine surfaceLine)
         {
             var characteristicPoints = new Dictionary<PipingCharacteristicPointType, Point3D>();
@@ -139,6 +157,16 @@
             characteristicPoints.ForEachElementDo(cp => SetCharacteristicPoint(surfaceLine, cp.Key, cp.Value));
         }
 
+        /// <summary>
+        /// Reads the characteristic points from the <paramref name="entity"/> and sets these 
+        /// to the <paramref name="surfaceLine"/>.
+        /// </summary>
+        /// <param name="entity">The entity to read.</param>
+        /// <param name="surfaceLine">The surface line to set the characteristic point on.</param>
+        /// <exception cref="InvalidEnumArgumentException">Thrown when the <paramref name="entity"/> 
+        /// contains an invalid type of characteristic point.</exception>
+        /// <exception cref="NotSupportedException">Thrown when the <paramref name="entity"/> contains a 
+        /// characteristic point that is not supported.</exception>
         private static void ReadCharacteristicPoints(this SurfaceLineEntity entity, MacroStabilityInwardsSurfaceLine surfaceLine)
         {
             var characteristicPoints = new Dictionary<MacroStabilityInwardsCharacteristicPointType, Point3D>();
@@ -152,6 +180,16 @@
             characteristicPoints.ForEachElementDo(cp => SetCharacteristicPoint(surfaceLine, cp.Key, cp.Value));
         }
 
+
+        /// <summary>
+        /// Sets the characteristic point and its coordinate to the <paramref name="surfaceLine"/>.
+        /// </summary>
+        /// <param name="surfaceLine">The surface line to set the characteristic point on.</param>
+        /// <param name="type">The type of characteristic point.</param>
+        /// <param name="geometryPoint">The point associated with the characteristic point.</param>
+        /// <exception cref="InvalidEnumArgumentException">Thrown when <paramref name="type"/> is not 
+        /// a valid <see cref="PipingCharacteristicPointType"/>.</exception>
+        /// <exception cref="NotSupportedException">Thrown when <paramref name="type"/> is not supported.</exception>
         private static void SetCharacteristicPoint(PipingSurfaceLine surfaceLine,
                                                    PipingCharacteristicPointType type,
                                                    Point3D geometryPoint)
@@ -188,6 +226,15 @@
             }
         }
 
+        /// <summary>
+        /// Sets the characteristic point and its coordinate to the <paramref name="surfaceLine"/>.
+        /// </summary>
+        /// <param name="surfaceLine">The surface line to set the characteristic point on.</param>
+        /// <param name="type">The type of characteristic point.</param>
+        /// <param name="geometryPoint">The point associated with the characteristic point.</param>
+        /// <exception cref="InvalidEnumArgumentException">Thrown when <paramref name="type"/> is not 
+        /// a valid <see cref="MacroStabilityInwardsCharacteristicPointType"/>.</exception>
+        /// <exception cref="NotSupportedException">Thrown when <paramref name="type"/> is not supported.</exception>
         private static void SetCharacteristicPoint(MacroStabilityInwardsSurfaceLine surfaceLine,
                                                    MacroStabilityInwardsCharacteristicPointType type,
                                                    Point3D geometryPoint)
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/SurfaceLineEntityReadExtensionsTest.cs
===================================================================
diff -u -r091da501e5dd61cf05b94c4d4f075c1e73b3d950 -r00e33c83f9799a2e2a0c00d7c93a0a9557701b0e
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/SurfaceLineEntityReadExtensionsTest.cs	(.../SurfaceLineEntityReadExtensionsTest.cs)	(revision 091da501e5dd61cf05b94c4d4f075c1e73b3d950)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/SurfaceLineEntityReadExtensionsTest.cs	(.../SurfaceLineEntityReadExtensionsTest.cs)	(revision 00e33c83f9799a2e2a0c00d7c93a0a9557701b0e)
@@ -20,11 +20,13 @@
 // All rights reserved.
 
 using System;
+using System.ComponentModel;
 using System.Linq;
 using Application.Ringtoets.Storage.DbContext;
 using Application.Ringtoets.Storage.Read;
 using Application.Ringtoets.Storage.Serializers;
 using Core.Common.Base.Geometry;
+using Core.Common.TestUtil;
 using NUnit.Framework;
 using Ringtoets.MacroStabilityInwards.Primitives;
 using Ringtoets.Piping.Primitives;
@@ -297,6 +299,39 @@
         }
 
         [Test]
+        public void ReadAsPipingSurfaceLine_WithInvalidPipingCharacteristicPointType_ThrowsInvalidEnumArgumentException()
+        {
+            // Setup
+            var random = new Random(31);
+
+            var points = new[]
+            {
+                CreatePoint3D(random)
+            };
+
+            const byte invalidCharacteristicPointType = 37;
+            var entity = new SurfaceLineEntity
+            {
+                Name = "Better name.",
+                ReferenceLineIntersectionX = random.NextDouble(),
+                ReferenceLineIntersectionY = random.NextDouble(),
+                PointsXml = new Point3DXmlSerializer().ToXml(points),
+                PipingCharacteristicPointEntities =
+                {
+                    CreatePipingCharacteristicPointEntity(points[0], (PipingCharacteristicPointType) invalidCharacteristicPointType)
+                }
+            };
+
+            // Call
+            TestDelegate call = () => entity.ReadAsPipingSurfaceLine(new ReadConversionCollector());
+
+            // Assert
+            string exoectedMessage = $"The value of argument 'type' ({invalidCharacteristicPointType}) is invalid for Enum type '{nameof(PipingCharacteristicPointType)}'.";
+            string parameterName = TestHelper.AssertThrowsArgumentExceptionAndTestMessage<InvalidEnumArgumentException>(call, exoectedMessage).ParamName;
+            Assert.AreEqual("type", parameterName);
+        }
+
+        [Test]
         public void ReadAsPipingSurfaceLine_SurfaceLineEntityReadMultipleTimes_ReturnSameSurfaceLine()
         {
             // Setup
@@ -618,6 +653,39 @@
         }
 
         [Test]
+        public void ReadAsMacroStabilityInwardsSurfaceLine_WithInvalidMacroStabilityCharacteristicPointType_ThrowsInvalidEnumArgumentException()
+        {
+            // Setup
+            var random = new Random(31);
+
+            var points = new[]
+            {
+                CreatePoint3D(random)
+            };
+
+            const byte invalidCharacteristicPointType = 37;
+            var entity = new SurfaceLineEntity
+            {
+                Name = "Better name.",
+                ReferenceLineIntersectionX = random.NextDouble(),
+                ReferenceLineIntersectionY = random.NextDouble(),
+                PointsXml = new Point3DXmlSerializer().ToXml(points),
+                MacroStabilityInwardsCharacteristicPointEntities =
+                {
+                    CreateMacroStabilityInwardsCharacteristicPointEntity(points[0], (MacroStabilityInwardsCharacteristicPointType) invalidCharacteristicPointType)
+                }
+            };
+
+            // Call
+            TestDelegate call = () => entity.ReadAsMacroStabilityInwardsSurfaceLine(new ReadConversionCollector());
+
+            // Assert
+            string exoectedMessage = $"The value of argument 'type' ({invalidCharacteristicPointType}) is invalid for Enum type '{nameof(MacroStabilityInwardsCharacteristicPointType)}'.";
+            string parameterName = TestHelper.AssertThrowsArgumentExceptionAndTestMessage<InvalidEnumArgumentException>(call, exoectedMessage).ParamName;
+            Assert.AreEqual("type", parameterName);
+        }
+
+        [Test]
         public void ReadAsMacroStabilityInwardsSurfaceLine_SurfaceLineEntityReadMultipleTimes_ReturnSameSurfaceLine()
         {
             // Setup
Index: Core/Common/src/Core.Common.Controls.TreeView/DragDropHandler.cs
===================================================================
diff -u -r8d255056f1af6be56ee92712ccad79d8bf2d5370 -r00e33c83f9799a2e2a0c00d7c93a0a9557701b0e
--- Core/Common/src/Core.Common.Controls.TreeView/DragDropHandler.cs	(.../DragDropHandler.cs)	(revision 8d255056f1af6be56ee92712ccad79d8bf2d5370)
+++ Core/Common/src/Core.Common.Controls.TreeView/DragDropHandler.cs	(.../DragDropHandler.cs)	(revision 00e33c83f9799a2e2a0c00d7c93a0a9557701b0e)
@@ -360,27 +360,32 @@
             int xPos, yPos;
             Rectangle bounds = node.Bounds;
 
-            if (anchor == AnchorStyles.Left)
+            switch (anchor)
             {
-                xPos = GetImageLeft(node) - placeHolderWidth;
+                case AnchorStyles.Left:
+                    xPos = GetImageLeft(node) - placeHolderWidth;
+                    break;
+                case AnchorStyles.Right:
+                    xPos = bounds.Right;
+                    break;
+                default:
+                    throw new NotSupportedException($"The enum value {nameof(AnchorStyles)}.{anchor} is not supported.");
             }
-            else
-            {
-                xPos = bounds.Right;
-            }
 
-            if (location == PlaceholderLocation.Top)
+            switch (location)
             {
-                yPos = bounds.Top;
+                case PlaceholderLocation.Top:
+                    yPos = bounds.Top;
+                    break;
+                case PlaceholderLocation.Bottom:
+                    yPos = bounds.Bottom;
+                    break;
+                case PlaceholderLocation.Middle:
+                    yPos = bounds.Top + bounds.Height / 2;
+                    break;
+                default:
+                    throw new NotSupportedException($"The enum value {nameof(PlaceholderLocation)}.{location} is not supported.");
             }
-            else if (location == PlaceholderLocation.Bottom)
-            {
-                yPos = bounds.Bottom;
-            }
-            else
-            {
-                yPos = bounds.Top + bounds.Height / 2;
-            }
 
             return CreateTrianglePoints(new Rectangle(xPos, yPos - placeHolderWidth, placeHolderWidth, placeHolderHeight), anchor);
         }
Index: Core/Common/src/Core.Common.Util/Drawing/ColorAccess.cs
===================================================================
diff -u -recdc2a3ec930a75ef8fb6358282164f054a9d780 -r00e33c83f9799a2e2a0c00d7c93a0a9557701b0e
--- Core/Common/src/Core.Common.Util/Drawing/ColorAccess.cs	(.../ColorAccess.cs)	(revision ecdc2a3ec930a75ef8fb6358282164f054a9d780)
+++ Core/Common/src/Core.Common.Util/Drawing/ColorAccess.cs	(.../ColorAccess.cs)	(revision 00e33c83f9799a2e2a0c00d7c93a0a9557701b0e)
@@ -85,6 +85,9 @@
         /// <param name="x">The x-coordinate.</param>
         /// <param name="y">The y-coordinate.</param>
         /// <returns>The color of the given pixel.</returns>
+        /// <exception cref="ArgumentOutOfRangeException">Thrown when the coordinates are out of bounds.</exception>
+        /// <exception cref="NotSupportedException">Thrown when the getting or setting the color at the specified 
+        /// coordinates of a <see cref="Bitmap"/> with an unsupported <see cref="PixelFormat"/>.</exception>
         public Color this[int x, int y]
         {
             get
@@ -216,6 +219,14 @@
             return res;
         }
 
+        /// <summary>
+        /// Validates if <paramref name="x"/> and <paramref name="y"/>
+        /// are in the range of the image that is accessible.
+        /// </summary>
+        /// <param name="x">The x-coordinate.</param>
+        /// <param name="y">The y-coordinate.</param>
+        /// <exception cref="ArgumentOutOfRangeException">Thrown when <paramref name="x"/>
+        /// or <paramref name="y"/> are out of the accessible range.</exception>
         private void ValidateIndices(int x, int y)
         {
             if (!IsInValidRange(x, y))
Index: Core/Components/test/Core.Components.BruTile.Test/Configurations/WellKnownTileSourceLayerConfigurationTest.cs
===================================================================
diff -u -r7f82fd637dc8796f3d270cb0fa6d9ab18548c6f4 -r00e33c83f9799a2e2a0c00d7c93a0a9557701b0e
--- Core/Components/test/Core.Components.BruTile.Test/Configurations/WellKnownTileSourceLayerConfigurationTest.cs	(.../WellKnownTileSourceLayerConfigurationTest.cs)	(revision 7f82fd637dc8796f3d270cb0fa6d9ab18548c6f4)
+++ Core/Components/test/Core.Components.BruTile.Test/Configurations/WellKnownTileSourceLayerConfigurationTest.cs	(.../WellKnownTileSourceLayerConfigurationTest.cs)	(revision 00e33c83f9799a2e2a0c00d7c93a0a9557701b0e)
@@ -38,11 +38,11 @@
         private TestSettingsHelper testSettingsHelper;
 
         [Test]
-        public void CreateInitializedConfiguration_InvalidWellKnownTileSource_ThenThrowsInvalidEnumArgumentException()
+        public void CreateInitializedConfiguration_InvalidWellKnownTileSource_ThrowsInvalidEnumArgumentException()
         {
             // Setup
             const int invalidTileSource = 9999;
-           
+
             // Call
             TestDelegate call = () => WellKnownTileSourceLayerConfiguration.CreateInitializedConfiguration((WellKnownTileSource) invalidTileSource);
 
Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/Configurations/Helpers/ConfigurationClosingStructureInflowModelTypeConverterTest.cs
===================================================================
diff -u -re772d0383cfbaf86b76034071d206af304a0de4d -r00e33c83f9799a2e2a0c00d7c93a0a9557701b0e
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/Configurations/Helpers/ConfigurationClosingStructureInflowModelTypeConverterTest.cs	(.../ConfigurationClosingStructureInflowModelTypeConverterTest.cs)	(revision e772d0383cfbaf86b76034071d206af304a0de4d)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/Configurations/Helpers/ConfigurationClosingStructureInflowModelTypeConverterTest.cs	(.../ConfigurationClosingStructureInflowModelTypeConverterTest.cs)	(revision 00e33c83f9799a2e2a0c00d7c93a0a9557701b0e)
@@ -105,7 +105,7 @@
         {
             // Setup
             var converter = new ConfigurationClosingStructureInflowModelTypeConverter();
-            const ConfigurationClosingStructureInflowModelType invalidValue = (ConfigurationClosingStructureInflowModelType)99999999;
+            const ConfigurationClosingStructureInflowModelType invalidValue = (ConfigurationClosingStructureInflowModelType) 99999999;
 
             // Call
             TestDelegate call = () => converter.ConvertTo(invalidValue, destinationType);
@@ -239,7 +239,7 @@
             // Setup
             const int invalidValue = -1;
             var converter = new ConfigurationClosingStructureInflowModelTypeConverter();
-            
+
             // Call
             TestDelegate call = () => converter.ConvertFrom((ClosingStructureInflowModelType) invalidValue);
 
Index: Ringtoets/Common/src/Ringtoets.Common.Data/AssessmentSection/IAssessmentSection.cs
===================================================================
diff -u -r091da501e5dd61cf05b94c4d4f075c1e73b3d950 -r00e33c83f9799a2e2a0c00d7c93a0a9557701b0e
--- Ringtoets/Common/src/Ringtoets.Common.Data/AssessmentSection/IAssessmentSection.cs	(.../IAssessmentSection.cs)	(revision 091da501e5dd61cf05b94c4d4f075c1e73b3d950)
+++ Ringtoets/Common/src/Ringtoets.Common.Data/AssessmentSection/IAssessmentSection.cs	(.../IAssessmentSection.cs)	(revision 00e33c83f9799a2e2a0c00d7c93a0a9557701b0e)
@@ -19,9 +19,7 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
-using System;
 using System.Collections.Generic;
-using System.ComponentModel;
 using Core.Common.Base;
 using Ringtoets.Common.Data.Contribution;
 using Ringtoets.Common.Data.FailureMechanism;
Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/AssessmentSection/RingtoetsWellKnownTileSourceExtensionTest.cs
===================================================================
diff -u -rca0345432ea951a80e3e956a8d485840c0897e1d -r00e33c83f9799a2e2a0c00d7c93a0a9557701b0e
--- Ringtoets/Common/test/Ringtoets.Common.Data.Test/AssessmentSection/RingtoetsWellKnownTileSourceExtensionTest.cs	(.../RingtoetsWellKnownTileSourceExtensionTest.cs)	(revision ca0345432ea951a80e3e956a8d485840c0897e1d)
+++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/AssessmentSection/RingtoetsWellKnownTileSourceExtensionTest.cs	(.../RingtoetsWellKnownTileSourceExtensionTest.cs)	(revision 00e33c83f9799a2e2a0c00d7c93a0a9557701b0e)
@@ -19,7 +19,6 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
-using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using Core.Common.TestUtil;
@@ -44,7 +43,7 @@
         }
 
         [Test]
-        public void GetDisplayName_InvalidEnum_ThrowsNotSupportedException()
+        public void GetDisplayName_InvalidEnum_ThrowsInvalidEnumArgumentException()
         {
             // Setup
             const int invalidValue = 9999;
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/TreeNodeInfos/RingtoetsTreeNodeInfoFactoryTest.cs
===================================================================
diff -u -rd236ecbbb507886199e326a205ef633576e0b5c3 -r00e33c83f9799a2e2a0c00d7c93a0a9557701b0e
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/TreeNodeInfos/RingtoetsTreeNodeInfoFactoryTest.cs	(.../RingtoetsTreeNodeInfoFactoryTest.cs)	(revision d236ecbbb507886199e326a205ef633576e0b5c3)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/TreeNodeInfos/RingtoetsTreeNodeInfoFactoryTest.cs	(.../RingtoetsTreeNodeInfoFactoryTest.cs)	(revision 00e33c83f9799a2e2a0c00d7c93a0a9557701b0e)
@@ -555,7 +555,8 @@
         /// <param name="dataContext">Output: The context corresponding with <paramref name="data"/>.</param>
         /// <param name="failureMechanism">The failure mechanism the item and context belong to.</param>
         /// <param name="initialName">Optional: The name of <paramref name="data"/>.</param>
-        /// <exception cref="NotSupportedException">Thrown when an invalid value of <see cref="CalculationItemType"/></exception>
+        /// <exception cref="NotSupportedException">Thrown when <paramref name="type"/> is an unsupported value 
+        /// of <see cref="CalculationItemType"/>.</exception>
         private static void CreateCalculationItemAndContext(CalculationItemType type, out ICalculationBase data, out object dataContext, IFailureMechanism failureMechanism, string initialName = null)
         {
             switch (type)
Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/Configurations/Helpers/XmlWriterExtensionsTest.cs
===================================================================
diff -u -r39864a3af725b9bb35bf4aa3e1774fb1c47a9270 -r00e33c83f9799a2e2a0c00d7c93a0a9557701b0e
--- Ringtoets/Common/test/Ringtoets.Common.IO.Test/Configurations/Helpers/XmlWriterExtensionsTest.cs	(.../XmlWriterExtensionsTest.cs)	(revision 39864a3af725b9bb35bf4aa3e1774fb1c47a9270)
+++ Ringtoets/Common/test/Ringtoets.Common.IO.Test/Configurations/Helpers/XmlWriterExtensionsTest.cs	(.../XmlWriterExtensionsTest.cs)	(revision 00e33c83f9799a2e2a0c00d7c93a0a9557701b0e)
@@ -357,7 +357,7 @@
         }
 
         [Test]
-        public void WriteWaveReduction_InvalidBreakWaterType_ThrowsNotSupportedException()
+        public void WriteWaveReduction_InvalidBreakWaterType_ThrowsInvalidEnumArgumentException()
         {
             // Setup
             string filePath = TestHelper.GetScratchPadPath(nameof(WriteWaveReduction_WithoutWaveReduction_ThrowsArgumentNullException));
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Configurations/Helpers/ConfigurationDikeSoilScenarioTypeConverterTest.cs
===================================================================
diff -u -r4b173a6b798a60935733fc02f0b31f2cf1394b5e -r00e33c83f9799a2e2a0c00d7c93a0a9557701b0e
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Configurations/Helpers/ConfigurationDikeSoilScenarioTypeConverterTest.cs	(.../ConfigurationDikeSoilScenarioTypeConverterTest.cs)	(revision 4b173a6b798a60935733fc02f0b31f2cf1394b5e)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Configurations/Helpers/ConfigurationDikeSoilScenarioTypeConverterTest.cs	(.../ConfigurationDikeSoilScenarioTypeConverterTest.cs)	(revision 00e33c83f9799a2e2a0c00d7c93a0a9557701b0e)
@@ -95,7 +95,7 @@
         [Test]
         [TestCase(typeof(string))]
         [TestCase(typeof(MacroStabilityInwardsDikeSoilScenario))]
-        public void ConvertTo_InvalidConfigurationDikeSoilScenario_ThrowsNotSupportedException(Type convertToType)
+        public void ConvertTo_InvalidConfigurationDikeSoilScenario_ThrowsInvalidEnumArgumentException(Type convertToType)
         {
             // Setup
             const ConfigurationDikeSoilScenario invalidValue = (ConfigurationDikeSoilScenario) 9999;
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Configurations/Helpers/ConfigurationGridDeterminationTypeConverterTest.cs
===================================================================
diff -u -r4b173a6b798a60935733fc02f0b31f2cf1394b5e -r00e33c83f9799a2e2a0c00d7c93a0a9557701b0e
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Configurations/Helpers/ConfigurationGridDeterminationTypeConverterTest.cs	(.../ConfigurationGridDeterminationTypeConverterTest.cs)	(revision 4b173a6b798a60935733fc02f0b31f2cf1394b5e)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Configurations/Helpers/ConfigurationGridDeterminationTypeConverterTest.cs	(.../ConfigurationGridDeterminationTypeConverterTest.cs)	(revision 00e33c83f9799a2e2a0c00d7c93a0a9557701b0e)
@@ -95,7 +95,7 @@
         [Test]
         [TestCase(typeof(string))]
         [TestCase(typeof(MacroStabilityInwardsGridDeterminationType))]
-        public void ConvertTo_InvalidConfigurationGridDeterminationType_ThrowsNotSupportedException(Type convertToType)
+        public void ConvertTo_InvalidConfigurationGridDeterminationType_ThrowsInvalidEnumArgumentException(Type convertToType)
         {
             // Setup
             const ConfigurationGridDeterminationType invalidValue = (ConfigurationGridDeterminationType) 9999;
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Configurations/Helpers/ConfigurationTangentLineDeterminationTypeConverterTest.cs
===================================================================
diff -u -r4b173a6b798a60935733fc02f0b31f2cf1394b5e -r00e33c83f9799a2e2a0c00d7c93a0a9557701b0e
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Configurations/Helpers/ConfigurationTangentLineDeterminationTypeConverterTest.cs	(.../ConfigurationTangentLineDeterminationTypeConverterTest.cs)	(revision 4b173a6b798a60935733fc02f0b31f2cf1394b5e)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Configurations/Helpers/ConfigurationTangentLineDeterminationTypeConverterTest.cs	(.../ConfigurationTangentLineDeterminationTypeConverterTest.cs)	(revision 00e33c83f9799a2e2a0c00d7c93a0a9557701b0e)
@@ -95,7 +95,7 @@
         [Test]
         [TestCase(typeof(string))]
         [TestCase(typeof(MacroStabilityInwardsTangentLineDeterminationType))]
-        public void ConvertTo_InvalidConfigurationTangentLineDeterminationType_ThrowsNotSupportedException(Type convertToType)
+        public void ConvertTo_InvalidConfigurationTangentLineDeterminationType_ThrowsInvalidEnumArgumentException(Type convertToType)
         {
             // Setup
             const ConfigurationTangentLineDeterminationType invalidValue = (ConfigurationTangentLineDeterminationType)9999;
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Configurations/Helpers/ConfigurationZoningBoundariesDeterminationTypeConverterTest.cs
===================================================================
diff -u -r4b173a6b798a60935733fc02f0b31f2cf1394b5e -r00e33c83f9799a2e2a0c00d7c93a0a9557701b0e
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Configurations/Helpers/ConfigurationZoningBoundariesDeterminationTypeConverterTest.cs	(.../ConfigurationZoningBoundariesDeterminationTypeConverterTest.cs)	(revision 4b173a6b798a60935733fc02f0b31f2cf1394b5e)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Configurations/Helpers/ConfigurationZoningBoundariesDeterminationTypeConverterTest.cs	(.../ConfigurationZoningBoundariesDeterminationTypeConverterTest.cs)	(revision 00e33c83f9799a2e2a0c00d7c93a0a9557701b0e)
@@ -95,7 +95,7 @@
         [Test]
         [TestCase(typeof(string))]
         [TestCase(typeof(MacroStabilityInwardsZoningBoundariesDeterminationType))]
-        public void ConvertTo_InvalidConfigurationZoningBoundariesDeterminationType_ThrowsNotSupportedException(Type convertToType)
+        public void ConvertTo_InvalidConfigurationZoningBoundariesDeterminationType_ThrowsInvalidEnumArgumentException(Type convertToType)
         {
             // Setup
             const ConfigurationZoningBoundariesDeterminationType invalidValue = (ConfigurationZoningBoundariesDeterminationType) 9999;