Index: Ringtoets/Common/src/Ringtoets.Common.Service/IllustrationPoints/CombinationTypeConverter.cs
===================================================================
diff -u -r6a3f98816290c35debe33a89871cbe3988d34fb3 -r624182c7e9be3e758f0c6a55e360edac0892d48e
--- Ringtoets/Common/src/Ringtoets.Common.Service/IllustrationPoints/CombinationTypeConverter.cs	(.../CombinationTypeConverter.cs)	(revision 6a3f98816290c35debe33a89871cbe3988d34fb3)
+++ Ringtoets/Common/src/Ringtoets.Common.Service/IllustrationPoints/CombinationTypeConverter.cs	(.../CombinationTypeConverter.cs)	(revision 624182c7e9be3e758f0c6a55e360edac0892d48e)
@@ -57,7 +57,7 @@
                 case HydraRingCombinationType.And:
                     return CombinationType.And;
                 default:
-                    throw new NotSupportedException($"A value of {hydraRingCombinationType} is not supported.");
+                    throw new NotSupportedException($"The value {hydraRingCombinationType} is not supported.");
             }
         }
     }
Index: Ringtoets/Common/src/Ringtoets.Common.Service/IllustrationPoints/FaultTreeIllustrationPointConverter.cs
===================================================================
diff -u -rcf5fa63f05c1018cdb14d5c664fa21f26026150c -r624182c7e9be3e758f0c6a55e360edac0892d48e
--- Ringtoets/Common/src/Ringtoets.Common.Service/IllustrationPoints/FaultTreeIllustrationPointConverter.cs	(.../FaultTreeIllustrationPointConverter.cs)	(revision cf5fa63f05c1018cdb14d5c664fa21f26026150c)
+++ Ringtoets/Common/src/Ringtoets.Common.Service/IllustrationPoints/FaultTreeIllustrationPointConverter.cs	(.../FaultTreeIllustrationPointConverter.cs)	(revision 624182c7e9be3e758f0c6a55e360edac0892d48e)
@@ -54,14 +54,13 @@
                 throw new ArgumentNullException(nameof(hydraRingFaultTreeIllustrationPoint));
             }
 
-            FaultTreeIllustrationPoint illustrationPoint;
             try
             {
                 CombinationType combinationType = CombinationTypeConverter.Convert(hydraRingFaultTreeIllustrationPoint.CombinationType);
                 IEnumerable<Stochast> stochasts = hydraRingFaultTreeIllustrationPoint
                     .Stochasts.Select(StochastConverter.Convert);
 
-                illustrationPoint = new FaultTreeIllustrationPoint(hydraRingFaultTreeIllustrationPoint.Name,
+                return new FaultTreeIllustrationPoint(hydraRingFaultTreeIllustrationPoint.Name,
                                                                    hydraRingFaultTreeIllustrationPoint.Beta,
                                                                    stochasts,
                                                                    combinationType);
@@ -71,8 +70,6 @@
                 string errorMessage = $"Could not convert the {typeof(HydraRingCombinationType)} into a {typeof(CombinationType)}.";
                 throw new IllustrationPointConversionException(errorMessage, e);
             }
-
-            return illustrationPoint;
         }
     }
 }
\ No newline at end of file
Index: Ringtoets/Common/src/Ringtoets.Common.Service/IllustrationPoints/IllustrationPointNodeConverter.cs
===================================================================
diff -u -rcf5fa63f05c1018cdb14d5c664fa21f26026150c -r624182c7e9be3e758f0c6a55e360edac0892d48e
--- Ringtoets/Common/src/Ringtoets.Common.Service/IllustrationPoints/IllustrationPointNodeConverter.cs	(.../IllustrationPointNodeConverter.cs)	(revision cf5fa63f05c1018cdb14d5c664fa21f26026150c)
+++ Ringtoets/Common/src/Ringtoets.Common.Service/IllustrationPoints/IllustrationPointNodeConverter.cs	(.../IllustrationPointNodeConverter.cs)	(revision 624182c7e9be3e758f0c6a55e360edac0892d48e)
@@ -81,8 +81,7 @@
         /// </summary>
         /// <param name="data">The <see cref="HydraRingIIllustrationPoint"/> to base the 
         /// <see cref="IllustrationPointBase"/> to create on.</param>
-        /// <returns>A <see cref="IllustrationPointBase"/>, <c>null</c> when no appropriate
-        /// conversion was found.</returns>
+        /// <returns>A <see cref="IllustrationPointBase"/>.</returns>
         /// <exception cref="IllustrationPointConversionException">Thrown when <paramref name="data"/>
         /// could not be converted.</exception>
         /// <exception cref="NotSupportedException">Thrown when no suitable conversion for <paramref name="data"/>
Index: Ringtoets/Common/test/Ringtoets.Common.Service.Test/IllustrationPoints/IllustrationPointNodeConverterTest.cs
===================================================================
diff -u -rcf5fa63f05c1018cdb14d5c664fa21f26026150c -r624182c7e9be3e758f0c6a55e360edac0892d48e
--- Ringtoets/Common/test/Ringtoets.Common.Service.Test/IllustrationPoints/IllustrationPointNodeConverterTest.cs	(.../IllustrationPointNodeConverterTest.cs)	(revision cf5fa63f05c1018cdb14d5c664fa21f26026150c)
+++ Ringtoets/Common/test/Ringtoets.Common.Service.Test/IllustrationPoints/IllustrationPointNodeConverterTest.cs	(.../IllustrationPointNodeConverterTest.cs)	(revision 624182c7e9be3e758f0c6a55e360edac0892d48e)
@@ -170,7 +170,6 @@
 
             string expectedMessageInnerException = $"Cannot convert {hydraRingIllustrationPointData.GetType()}.";
             Exception innerException = exception.InnerException;
-            Assert.IsNotNull(innerException);
             Assert.IsInstanceOf<NotSupportedException>(innerException);
             Assert.AreEqual(expectedMessageInnerException, innerException.Message);
         }
@@ -204,7 +203,6 @@
 
             string expectedMessageInnerException = $"Cannot convert {typeof(TestHydraRingIllustrationPointData)}.";
             Exception innerException = exception.InnerException;
-            Assert.IsNotNull(innerException);
             Assert.IsInstanceOf<NotSupportedException>(innerException);
             Assert.AreEqual(expectedMessageInnerException, innerException.Message);
         }