Index: Ringtoets/Common/src/Ringtoets.Common.Service/HydraRingInputParser.cs
===================================================================
diff -u -rb3b6c13cf736c134476b3db34281332d01ca86b1 -r8c4d6b66b27822afabcee01087a961f055fda01c
--- Ringtoets/Common/src/Ringtoets.Common.Service/HydraRingInputParser.cs	(.../HydraRingInputParser.cs)	(revision b3b6c13cf736c134476b3db34281332d01ca86b1)
+++ Ringtoets/Common/src/Ringtoets.Common.Service/HydraRingInputParser.cs	(.../HydraRingInputParser.cs)	(revision 8c4d6b66b27822afabcee01087a961f055fda01c)
@@ -19,7 +19,9 @@
 // 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 System.Linq;
 using Ringtoets.Common.Data.DikeProfiles;
 using Ringtoets.HydraRing.Calculation.Data;
@@ -49,9 +51,38 @@
         /// <param name="input">A calculation input object that implements <see cref="IUseBreakWater"/>.</param>
         /// <returns>A <see cref="HydraRingBreakWater"/> object, <c>null</c> if <see cref="IUseBreakWater.UseBreakWater"/>
         /// is <c>false</c></returns>
+        /// <exception cref="InvalidEnumArgumentException">Thrown when the break water type is an invalid value.</exception>
+        /// <exception cref="NotSupportedException">Thrown when the break water type is a valid value but unsupported.</exception>
         public static HydraRingBreakWater ParseBreakWater(IUseBreakWater input)
         {
-            return input.UseBreakWater ? new HydraRingBreakWater((int) input.BreakWater.Type, input.BreakWater.Height) : null;
+            return input.UseBreakWater ? new HydraRingBreakWater(ConvertBreakWaterType(input.BreakWater.Type), input.BreakWater.Height) : null;
         }
+
+        /// <summary>
+        /// Converts <paramref name="type"/> into an integer value to be used by Hydra-Ring.
+        /// </summary>
+        /// <param name="type">The <see cref="BreakWaterType"/> to convert.</param>
+        /// <returns>The integer value to be used by Hydra-Ring.</returns>
+        /// <exception cref="InvalidEnumArgumentException">Thrown when <paramref name="type"/> is an invalid value.</exception>
+        /// <exception cref="NotSupportedException">Thrown when <paramref name="type"/> is a valid value but unsupported.</exception>
+        private static int ConvertBreakWaterType(BreakWaterType type)
+        {
+            if (!Enum.IsDefined(type.GetType(), type))
+            {
+                throw new InvalidEnumArgumentException(nameof(type), (int) type, type.GetType());
+            }
+
+            switch (type)
+            {
+                case BreakWaterType.Caisson:
+                    return 1;
+                case BreakWaterType.Wall:
+                    return 2;
+                case BreakWaterType.Dam:
+                    return 3;
+                default:
+                    throw new NotSupportedException($"Value '{type}' is not supported.");
+            }
+        }
     }
 }
\ No newline at end of file
Index: Ringtoets/Common/test/Ringtoets.Common.Service.Test/HydraRingInputParserTest.cs
===================================================================
diff -u -r1bbf51443c907b5f202e80764fa05f2e7f842c04 -r8c4d6b66b27822afabcee01087a961f055fda01c
--- Ringtoets/Common/test/Ringtoets.Common.Service.Test/HydraRingInputParserTest.cs	(.../HydraRingInputParserTest.cs)	(revision 1bbf51443c907b5f202e80764fa05f2e7f842c04)
+++ Ringtoets/Common/test/Ringtoets.Common.Service.Test/HydraRingInputParserTest.cs	(.../HydraRingInputParserTest.cs)	(revision 8c4d6b66b27822afabcee01087a961f055fda01c)
@@ -83,10 +83,10 @@
         }
 
         [Test]
-        [TestCase(BreakWaterType.Wall)]
-        [TestCase(BreakWaterType.Caisson)]
-        [TestCase(BreakWaterType.Dam)]
-        public void ParseBreakWater_Use_ReturnHydraRingBreakWater(BreakWaterType breakWaterType)
+        [TestCase(BreakWaterType.Caisson, 1)]
+        [TestCase(BreakWaterType.Wall, 2)]
+        [TestCase(BreakWaterType.Dam, 3)]
+        public void ParseBreakWater_Use_ReturnHydraRingBreakWater(BreakWaterType breakWaterType, int expectedBreakWaterType)
         {
             // Setup
             var random = new Random(22);
@@ -103,14 +103,14 @@
             HydraRingBreakWater parsedBreakWater = HydraRingInputParser.ParseBreakWater(breakWater);
 
             // Assert 
-            Assert.AreEqual((int) expectedBreakWater.Type, parsedBreakWater.Type);
+            Assert.AreEqual(expectedBreakWaterType, parsedBreakWater.Type);
             Assert.AreEqual(expectedBreakWater.Height, parsedBreakWater.Height, expectedBreakWater.Height.GetAccuracy());
             mockRepository.VerifyAll();
         }
 
         [Test]
-        [TestCase(BreakWaterType.Wall)]
         [TestCase(BreakWaterType.Caisson)]
+        [TestCase(BreakWaterType.Wall)]
         [TestCase(BreakWaterType.Dam)]
         public void ParseBreakWater_DoesNotUse_ReturnNull(BreakWaterType breakWaterType)
         {