Index: Core/Common/test/Core.Common.TestUtil/TestHelper.cs
===================================================================
diff -u -ra979e6ebe32c21456dd9139b3fb07f4a499351c1 -r797860a90e2e806327a86f77e20a368eaf25d6ed
--- Core/Common/test/Core.Common.TestUtil/TestHelper.cs	(.../TestHelper.cs)	(revision a979e6ebe32c21456dd9139b3fb07f4a499351c1)
+++ Core/Common/test/Core.Common.TestUtil/TestHelper.cs	(.../TestHelper.cs)	(revision 797860a90e2e806327a86f77e20a368eaf25d6ed)
@@ -228,6 +228,19 @@
         }
 
         /// <summary>
+        /// Method use to perform any type of assertion on the generated log while performing
+        /// a particular action.
+        /// </summary>
+        /// <param name="action">Action to be performed while recording the log.</param>
+        /// <param name="assertLogMessagesAndExceptions">The assertion logic performed on the generated log-messages.</param>
+        public static void AssertLogMessagesAndLoggedExceptions(Action action,
+                                                                Action<IEnumerable<Tuple<string, Level, Exception>>> assertLogMessagesAndExceptions)
+        {
+            IEnumerable<Tuple<string, Level, Exception>> renderedMessages = GetAllRenderedMessagesWithExceptions(action);
+            assertLogMessagesAndExceptions(renderedMessages);
+        }
+
+        /// <summary>
         /// Checks the number of messages in the log.
         /// </summary>
         /// <param name="action">Action to be performed while recording the log</param>
@@ -589,6 +602,26 @@
             return renderedMessages;
         }
 
+        private static IEnumerable<Tuple<string, Level, Exception>> GetAllRenderedMessagesWithExceptions(Action action)
+        {
+            var memoryAppender = new MemoryAppender();
+            BasicConfigurator.Configure(memoryAppender);
+            LogHelper.SetLoggingLevel(Level.All);
+
+            action();
+
+            List<Tuple<string, Level, Exception>> renderedMessages = memoryAppender.GetEvents()
+                                                                                   .Select(le => Tuple.Create(le.RenderedMessage,
+                                                                                                              le.Level,
+                                                                                                              le.ExceptionObject))
+                                                                                   .ToList();
+
+            memoryAppender.Close();
+            LogHelper.ResetLogging();
+
+            return renderedMessages;
+        }
+
         private static Color[] GetImageAsColorArray(Image image)
         {
             // Convert image to ARGB bitmap using 8bits/channel:
Index: Ringtoets/Common/src/Ringtoets.Common.Service/DesignWaterLevelCalculationService.cs
===================================================================
diff -u -r2e5f2b59e81cda48f3d7ee03afa4db88abc7b1a8 -r797860a90e2e806327a86f77e20a368eaf25d6ed
--- Ringtoets/Common/src/Ringtoets.Common.Service/DesignWaterLevelCalculationService.cs	(.../DesignWaterLevelCalculationService.cs)	(revision 2e5f2b59e81cda48f3d7ee03afa4db88abc7b1a8)
+++ Ringtoets/Common/src/Ringtoets.Common.Service/DesignWaterLevelCalculationService.cs	(.../DesignWaterLevelCalculationService.cs)	(revision 797860a90e2e806327a86f77e20a368eaf25d6ed)
@@ -26,6 +26,7 @@
 using Core.Common.Base.IO;
 using Core.Common.Utils;
 using log4net;
+using Ringtoets.Common.Data.Exceptions;
 using Ringtoets.Common.Data.Hydraulics;
 using Ringtoets.Common.Data.IllustrationPoints;
 using Ringtoets.Common.IO.HydraRing;
@@ -210,9 +211,16 @@
         {
             if (hydraRingGeneralResult != null)
             {
-                GeneralResult<TopLevelSubMechanismIllustrationPoint> generalResult =
-                    GeneralResultConverter.CreateGeneralResultTopLevelSubMechanismIllustrationPoint(hydraRingGeneralResult);
-                hydraulicBoundaryLocationOutput.SetIllustrationPoints(generalResult);
+                try
+                {
+                    GeneralResult<TopLevelSubMechanismIllustrationPoint> generalResult =
+                        GeneralResultConverter.CreateGeneralResultTopLevelSubMechanismIllustrationPoint(hydraRingGeneralResult);
+                    hydraulicBoundaryLocationOutput.SetIllustrationPoints(generalResult);
+                }
+                catch (IllustrationPointConversionException e)
+                {
+                    log.Warn("Het uitlezen van illustratiepunten is mislukt.", e);
+                }
             }
         }
 
Index: Ringtoets/Common/src/Ringtoets.Common.Service/WaveHeightCalculationService.cs
===================================================================
diff -u -r2e5f2b59e81cda48f3d7ee03afa4db88abc7b1a8 -r797860a90e2e806327a86f77e20a368eaf25d6ed
--- Ringtoets/Common/src/Ringtoets.Common.Service/WaveHeightCalculationService.cs	(.../WaveHeightCalculationService.cs)	(revision 2e5f2b59e81cda48f3d7ee03afa4db88abc7b1a8)
+++ Ringtoets/Common/src/Ringtoets.Common.Service/WaveHeightCalculationService.cs	(.../WaveHeightCalculationService.cs)	(revision 797860a90e2e806327a86f77e20a368eaf25d6ed)
@@ -26,6 +26,7 @@
 using Core.Common.Base.IO;
 using Core.Common.Utils;
 using log4net;
+using Ringtoets.Common.Data.Exceptions;
 using Ringtoets.Common.Data.Hydraulics;
 using Ringtoets.Common.Data.IllustrationPoints;
 using Ringtoets.Common.IO.HydraRing;
@@ -211,9 +212,16 @@
         {
             if (hydraRingGeneralResult != null)
             {
-                GeneralResult<TopLevelSubMechanismIllustrationPoint> generalResult =
-                    GeneralResultConverter.CreateGeneralResultTopLevelSubMechanismIllustrationPoint(hydraRingGeneralResult);
-                hydraulicBoundaryLocationOutput.SetIllustrationPoints(generalResult);
+                try
+                {
+                    GeneralResult<TopLevelSubMechanismIllustrationPoint> generalResult =
+                        GeneralResultConverter.CreateGeneralResultTopLevelSubMechanismIllustrationPoint(hydraRingGeneralResult);
+                    hydraulicBoundaryLocationOutput.SetIllustrationPoints(generalResult);
+                }
+                catch (IllustrationPointConversionException e)
+                {
+                    log.Warn("Het uitlezen van illustratiepunten is mislukt.", e);
+                }
             }
         }
 
Index: Ringtoets/Common/test/Ringtoets.Common.Service.Test/DesignWaterLevelCalculationServiceTest.cs
===================================================================
diff -u -r93044b3ed52a925c5321b68ff2beb886c6bf7068 -r797860a90e2e806327a86f77e20a368eaf25d6ed
--- Ringtoets/Common/test/Ringtoets.Common.Service.Test/DesignWaterLevelCalculationServiceTest.cs	(.../DesignWaterLevelCalculationServiceTest.cs)	(revision 93044b3ed52a925c5321b68ff2beb886c6bf7068)
+++ Ringtoets/Common/test/Ringtoets.Common.Service.Test/DesignWaterLevelCalculationServiceTest.cs	(.../DesignWaterLevelCalculationServiceTest.cs)	(revision 797860a90e2e806327a86f77e20a368eaf25d6ed)
@@ -23,8 +23,10 @@
 using System.IO;
 using System.Linq;
 using Core.Common.TestUtil;
+using log4net.Core;
 using NUnit.Framework;
 using Rhino.Mocks;
+using Ringtoets.Common.Data.Exceptions;
 using Ringtoets.Common.Data.Hydraulics;
 using Ringtoets.Common.Service.MessageProviders;
 using Ringtoets.Common.Service.TestUtil;
@@ -128,7 +130,7 @@
         [Test]
         [TestCase(true)]
         [TestCase(false)]
-        public void Calculate_ValidDesignWaterLevelCalculation_StartsCalculationWithRightParameters(bool readIllustrationPoints)
+        public void Calculate_ValidDesignWaterLevelCalculationAndConverges_StartsCalculationWithRightParametersAndLogs(bool readIllustrationPoints)
         {
             // Setup
             string validFilePath = Path.Combine(testDataPath, validFile);
@@ -139,7 +141,8 @@
 
             var calculator = new TestDesignWaterLevelCalculator
             {
-                IllustrationPointsResult = new TestGeneralResult()
+                IllustrationPointsResult = new TestGeneralResult(),
+                Converged = true
             };
 
             var mockRepository = new MockRepository();
@@ -151,19 +154,28 @@
             calculation.Expect(c => c.Id).Return(id);
             calculation.Expect(c => c.CalculateIllustrationPoints).Return(readIllustrationPoints);
 
-            var calculationMessageProvider = mockRepository.Stub<ICalculationMessageProvider>();
-            calculationMessageProvider.Stub(calc => calc.GetCalculatedNotConvergedMessage(locationName)).Return(string.Empty);
+            var calculationMessageProvider = mockRepository.StrictMock<ICalculationMessageProvider>();
             mockRepository.ReplayAll();
 
             using (new HydraRingCalculatorFactoryConfig(calculatorFactory))
             {
                 // Call
-                new DesignWaterLevelCalculationService().Calculate(calculation,
-                                                                   validFilePath,
-                                                                   norm,
-                                                                   calculationMessageProvider);
+                Action call = () => new DesignWaterLevelCalculationService().Calculate(calculation,
+                                                                                       validFilePath,
+                                                                                       norm,
+                                                                                       calculationMessageProvider);
 
                 // Assert
+                TestHelper.AssertLogMessages(call, messages =>
+                {
+                    string[] msgs = messages.ToArray();
+                    Assert.AreEqual(3, msgs.Length);
+                    CalculationServiceTestHelper.AssertCalculationStartMessage(msgs[0]);
+                    Assert.AreEqual($"Toetspeil berekening is uitgevoerd op de tijdelijke locatie '{calculator.OutputDirectory}'. " +
+                                    "Gedetailleerde invoer en uitvoer kan in de bestanden op deze locatie worden gevonden.", msgs[1]);
+                    CalculationServiceTestHelper.AssertCalculationEndMessage(msgs[2]);
+                });
+
                 AssessmentLevelCalculationInput expectedInput = CreateInput(id, norm);
                 AssertInput(expectedInput, calculator.ReceivedInputs.Single());
                 Assert.IsFalse(calculator.IsCanceled);
@@ -174,6 +186,129 @@
         }
 
         [Test]
+        [TestCase(true)]
+        [TestCase(false)]
+        public void Calculate_ValidDesignWaterLevelCalculationAndDoesNotConverge_StartsCalculationWithRightParametersAndLogsWarning(bool readIllustrationPoints)
+        {
+            // Setup
+            string validFilePath = Path.Combine(testDataPath, validFile);
+
+            const long id = 100;
+            const string locationName = "punt_flw_ 1";
+            const double norm = 1.0 / 30;
+
+            var calculator = new TestDesignWaterLevelCalculator
+            {
+                IllustrationPointsResult = new TestGeneralResult(),
+                Converged = false
+            };
+
+            var mockRepository = new MockRepository();
+            var calculatorFactory = mockRepository.StrictMock<IHydraRingCalculatorFactory>();
+            calculatorFactory.Expect(cf => cf.CreateDesignWaterLevelCalculator(testDataPath)).Return(calculator);
+
+            var calculation = mockRepository.Stub<IHydraulicBoundaryWrapperCalculation>();
+            calculation.Stub(c => c.Name).Return(locationName);
+            calculation.Expect(c => c.Id).Return(id);
+            calculation.Expect(c => c.CalculateIllustrationPoints).Return(readIllustrationPoints);
+
+            const string failedConvergenceMessage = "Did not converge";
+            var calculationMessageProvider = mockRepository.StrictMock<ICalculationMessageProvider>();
+            calculationMessageProvider.Expect(c => c.GetCalculatedNotConvergedMessage(locationName)).Return(failedConvergenceMessage);
+            mockRepository.ReplayAll();
+
+            using (new HydraRingCalculatorFactoryConfig(calculatorFactory))
+            {
+                // Call
+                Action call = () => new DesignWaterLevelCalculationService().Calculate(calculation,
+                                                                                       validFilePath,
+                                                                                       norm,
+                                                                                       calculationMessageProvider);
+
+                // Assert
+                TestHelper.AssertLogMessages(call, messages =>
+                {
+                    string[] msgs = messages.ToArray();
+                    Assert.AreEqual(4, msgs.Length);
+                    CalculationServiceTestHelper.AssertCalculationStartMessage(msgs[0]);
+                    Assert.AreEqual(failedConvergenceMessage, msgs[1]);
+                    Assert.AreEqual($"Toetspeil berekening is uitgevoerd op de tijdelijke locatie '{calculator.OutputDirectory}'. " +
+                                    "Gedetailleerde invoer en uitvoer kan in de bestanden op deze locatie worden gevonden.", msgs[2]);
+                    CalculationServiceTestHelper.AssertCalculationEndMessage(msgs[3]);
+                });
+
+                AssessmentLevelCalculationInput expectedInput = CreateInput(id, norm);
+                AssertInput(expectedInput, calculator.ReceivedInputs.Single());
+                Assert.IsFalse(calculator.IsCanceled);
+                Assert.IsNotNull(calculation.Output);
+                Assert.AreEqual(readIllustrationPoints, calculation.Output.HasIllustrationPoints);
+            }
+            mockRepository.VerifyAll();
+        }
+
+        [Test]
+        public void Calculate_ValidDesignWaterLevelCalculationButInvalidIllustrationPointResults_StartsCalculationWithRightParametersAndLogsWarning()
+        {
+            // Setup
+            string validFilePath = Path.Combine(testDataPath, validFile);
+
+            const long id = 100;
+            const string locationName = "punt_flw_ 1";
+            const double norm = 1.0 / 30;
+
+            var calculator = new TestDesignWaterLevelCalculator
+            {
+                IllustrationPointsResult = TestGeneralResult.CreateGeneralResultWithFaultTreeIllustrationPoints(),
+                Converged = true
+            };
+
+            var mockRepository = new MockRepository();
+            var calculatorFactory = mockRepository.StrictMock<IHydraRingCalculatorFactory>();
+            calculatorFactory.Expect(cf => cf.CreateDesignWaterLevelCalculator(testDataPath)).Return(calculator);
+
+            var calculation = mockRepository.Stub<IHydraulicBoundaryWrapperCalculation>();
+            calculation.Stub(c => c.Name).Return(locationName);
+            calculation.Expect(c => c.Id).Return(id);
+            calculation.Expect(c => c.CalculateIllustrationPoints).Return(true);
+
+            var calculationMessageProvider = mockRepository.StrictMock<ICalculationMessageProvider>();
+            mockRepository.ReplayAll();
+
+            using (new HydraRingCalculatorFactoryConfig(calculatorFactory))
+            {
+                // Call
+                Action call = () => new DesignWaterLevelCalculationService().Calculate(calculation,
+                                                                                       validFilePath,
+                                                                                       norm,
+                                                                                       calculationMessageProvider);
+
+                // Assert
+                TestHelper.AssertLogMessagesAndLoggedExceptions(call, messages =>
+                {
+                    Tuple<string, Level, Exception>[] tupleArray = messages.ToArray();
+
+                    string[] msgs = tupleArray.Select(tuple => tuple.Item1).ToArray();
+                    Assert.AreEqual(4, msgs.Length);
+
+                    CalculationServiceTestHelper.AssertCalculationStartMessage(msgs[0]);
+                    Assert.AreEqual("Het uitlezen van illustratiepunten is mislukt.", msgs[1]);
+                    Assert.AreEqual($"Toetspeil berekening is uitgevoerd op de tijdelijke locatie '{calculator.OutputDirectory}'. " +
+                                    "Gedetailleerde invoer en uitvoer kan in de bestanden op deze locatie worden gevonden.", msgs[2]);
+                    CalculationServiceTestHelper.AssertCalculationEndMessage(msgs[3]);
+
+                    Assert.IsInstanceOf<IllustrationPointConversionException>(tupleArray[1].Item3);
+                });
+
+                AssessmentLevelCalculationInput expectedInput = CreateInput(id, norm);
+                AssertInput(expectedInput, calculator.ReceivedInputs.Single());
+                Assert.IsFalse(calculator.IsCanceled);
+                Assert.IsNotNull(calculation.Output);
+                Assert.IsFalse(calculation.Output.HasIllustrationPoints);
+            }
+            mockRepository.VerifyAll();
+        }
+
+        [Test]
         public void Calculate_ValidDesignWaterLevelCalculationThrowsException_ThrowsHydraRingFileParserException()
         {
             // Setup
Index: Ringtoets/Common/test/Ringtoets.Common.Service.Test/Ringtoets.Common.Service.Test.csproj
===================================================================
diff -u -ra1d26cb03e95b46fe8600b53a8e91dfde417ca56 -r797860a90e2e806327a86f77e20a368eaf25d6ed
--- Ringtoets/Common/test/Ringtoets.Common.Service.Test/Ringtoets.Common.Service.Test.csproj	(.../Ringtoets.Common.Service.Test.csproj)	(revision a1d26cb03e95b46fe8600b53a8e91dfde417ca56)
+++ Ringtoets/Common/test/Ringtoets.Common.Service.Test/Ringtoets.Common.Service.Test.csproj	(.../Ringtoets.Common.Service.Test.csproj)	(revision 797860a90e2e806327a86f77e20a368eaf25d6ed)
@@ -39,6 +39,10 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="log4net, Version=1.2.14.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\log4net.2.0.4\lib\net40-full\log4net.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="nunit.framework, Version=3.6.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
       <HintPath>..\..\..\..\packages\NUnit.3.6.0\lib\net40\nunit.framework.dll</HintPath>
       <Private>True</Private>
@@ -96,6 +100,7 @@
     <None Include="..\..\..\..\build\Copying.licenseheader">
       <Link>Copying.licenseheader</Link>
     </None>
+    <None Include="app.config" />
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
Index: Ringtoets/Common/test/Ringtoets.Common.Service.Test/WaveHeightCalculationServiceTest.cs
===================================================================
diff -u -r0913b25b262329fc46c40cc84e4c127dae21b85f -r797860a90e2e806327a86f77e20a368eaf25d6ed
--- Ringtoets/Common/test/Ringtoets.Common.Service.Test/WaveHeightCalculationServiceTest.cs	(.../WaveHeightCalculationServiceTest.cs)	(revision 0913b25b262329fc46c40cc84e4c127dae21b85f)
+++ Ringtoets/Common/test/Ringtoets.Common.Service.Test/WaveHeightCalculationServiceTest.cs	(.../WaveHeightCalculationServiceTest.cs)	(revision 797860a90e2e806327a86f77e20a368eaf25d6ed)
@@ -23,8 +23,10 @@
 using System.IO;
 using System.Linq;
 using Core.Common.TestUtil;
+using log4net.Core;
 using NUnit.Framework;
 using Rhino.Mocks;
+using Ringtoets.Common.Data.Exceptions;
 using Ringtoets.Common.Data.Hydraulics;
 using Ringtoets.Common.Service.MessageProviders;
 using Ringtoets.Common.Service.TestUtil;
@@ -128,7 +130,7 @@
         [Test]
         [TestCase(true)]
         [TestCase(false)]
-        public void Calculate_ValidWaveHeightCalculation_StartsCalculationWithRightParameters(bool readIllustrationPoints)
+        public void Calculate_ValidWaveHeightCalculationAndConverges_StartsCalculationWithRightParametersAndLogs(bool readIllustrationPoints)
         {
             // Setup
             string validFilePath = Path.Combine(testDataPath, validFile);
@@ -139,7 +141,8 @@
 
             var calculator = new TestWaveHeightCalculator
             {
-                IllustrationPointsResult = new TestGeneralResult()
+                IllustrationPointsResult = new TestGeneralResult(),
+                Converged = true
             };
 
             var mockRepository = new MockRepository();
@@ -151,28 +154,159 @@
             calculation.Expect(c => c.Id).Return(id);
             calculation.Expect(c => c.CalculateIllustrationPoints).Return(readIllustrationPoints);
 
-            var calculationMessageProvider = mockRepository.Stub<ICalculationMessageProvider>();
-            calculationMessageProvider.Stub(calc => calc.GetCalculatedNotConvergedMessage(locationName)).Return(string.Empty);
+            var calculationMessageProvider = mockRepository.StrictMock<ICalculationMessageProvider>();
             mockRepository.ReplayAll();
 
             using (new HydraRingCalculatorFactoryConfig(calculatorFactory))
             {
-                new WaveHeightCalculationService().Calculate(calculation,
-                                                             validFilePath,
-                                                             norm,
-                                                             calculationMessageProvider);
+                Action call = () => new WaveHeightCalculationService().Calculate(calculation,
+                                                                                 validFilePath,
+                                                                                 norm,
+                                                                                 calculationMessageProvider);
 
                 // Assert
+                TestHelper.AssertLogMessages(call, messages =>
+                {
+                    string[] msgs = messages.ToArray();
+                    Assert.AreEqual(3, msgs.Length);
+                    CalculationServiceTestHelper.AssertCalculationStartMessage(msgs[0]);
+                    Assert.AreEqual($"Golfhoogte berekening is uitgevoerd op de tijdelijke locatie '{calculator.OutputDirectory}'. " +
+                                    "Gedetailleerde invoer en uitvoer kan in de bestanden op deze locatie worden gevonden.", msgs[1]);
+                    CalculationServiceTestHelper.AssertCalculationEndMessage(msgs[2]);
+                });
+
                 AssessmentLevelCalculationInput expectedInput = CreateInput(id, norm);
                 AssertInput(expectedInput, calculator.ReceivedInputs.Single());
                 Assert.IsFalse(calculator.IsCanceled);
+                Assert.IsNotNull(calculation.Output);
+                Assert.AreEqual(readIllustrationPoints, calculation.Output.HasIllustrationPoints);
+            }
+            mockRepository.VerifyAll();
+        }
 
+        [Test]
+        [TestCase(true)]
+        [TestCase(false)]
+        public void Calculate_ValidWaveHeightCalculationAndDoesNotConverge_StartsCalculationWithRightParametersAndLogsWarning(bool readIllustrationPoints)
+        {
+            // Setup
+            string validFilePath = Path.Combine(testDataPath, validFile);
+
+            const long id = 100;
+            const string locationName = "punt_flw_ 1";
+            const double norm = 1.0 / 30;
+
+            var calculator = new TestWaveHeightCalculator
+            {
+                IllustrationPointsResult = new TestGeneralResult(),
+                Converged = false
+            };
+
+            var mockRepository = new MockRepository();
+            var calculatorFactory = mockRepository.StrictMock<IHydraRingCalculatorFactory>();
+            calculatorFactory.Expect(cf => cf.CreateWaveHeightCalculator(testDataPath)).Return(calculator);
+
+            var calculation = mockRepository.Stub<IHydraulicBoundaryWrapperCalculation>();
+            calculation.Stub(c => c.Name).Return(locationName);
+            calculation.Expect(c => c.Id).Return(id);
+            calculation.Expect(c => c.CalculateIllustrationPoints).Return(readIllustrationPoints);
+
+            var calculationMessageProvider = mockRepository.StrictMock<ICalculationMessageProvider>();
+            const string failedConvergenceMessage = "Did not converge";
+            calculationMessageProvider.Expect(calc => calc.GetCalculatedNotConvergedMessage(locationName)).Return(failedConvergenceMessage);
+            mockRepository.ReplayAll();
+
+            using (new HydraRingCalculatorFactoryConfig(calculatorFactory))
+            {
+                Action call = () => new WaveHeightCalculationService().Calculate(calculation,
+                                                                                 validFilePath,
+                                                                                 norm,
+                                                                                 calculationMessageProvider);
+
+                // Assert
+                TestHelper.AssertLogMessages(call, messages =>
+                {
+                    string[] msgs = messages.ToArray();
+                    Assert.AreEqual(4, msgs.Length);
+                    CalculationServiceTestHelper.AssertCalculationStartMessage(msgs[0]);
+                    Assert.AreEqual(failedConvergenceMessage, msgs[1]);
+                    Assert.AreEqual($"Golfhoogte berekening is uitgevoerd op de tijdelijke locatie '{calculator.OutputDirectory}'. " +
+                                    "Gedetailleerde invoer en uitvoer kan in de bestanden op deze locatie worden gevonden.", msgs[2]);
+                    CalculationServiceTestHelper.AssertCalculationEndMessage(msgs[3]);
+                });
+
+                AssessmentLevelCalculationInput expectedInput = CreateInput(id, norm);
+                AssertInput(expectedInput, calculator.ReceivedInputs.Single());
+                Assert.IsFalse(calculator.IsCanceled);
+                Assert.IsNotNull(calculation.Output);
                 Assert.AreEqual(readIllustrationPoints, calculation.Output.HasIllustrationPoints);
             }
             mockRepository.VerifyAll();
         }
 
         [Test]
+        public void Calculate_ValidDesignWaterLevelCalculationButInvalidIllustrationPointResults_StartsCalculationWithRightParametersAndLogsWarning()
+        {
+            // Setup
+            string validFilePath = Path.Combine(testDataPath, validFile);
+
+            const long id = 100;
+            const string locationName = "punt_flw_ 1";
+            const double norm = 1.0 / 30;
+
+            var calculator = new TestWaveHeightCalculator
+            {
+                IllustrationPointsResult = TestGeneralResult.CreateGeneralResultWithFaultTreeIllustrationPoints(),
+                Converged = true
+            };
+
+            var mockRepository = new MockRepository();
+            var calculatorFactory = mockRepository.StrictMock<IHydraRingCalculatorFactory>();
+            calculatorFactory.Expect(cf => cf.CreateWaveHeightCalculator(testDataPath)).Return(calculator);
+
+            var calculation = mockRepository.Stub<IHydraulicBoundaryWrapperCalculation>();
+            calculation.Stub(c => c.Name).Return(locationName);
+            calculation.Expect(c => c.Id).Return(id);
+            calculation.Expect(c => c.CalculateIllustrationPoints).Return(true);
+
+            var calculationMessageProvider = mockRepository.StrictMock<ICalculationMessageProvider>();
+            mockRepository.ReplayAll();
+
+            using (new HydraRingCalculatorFactoryConfig(calculatorFactory))
+            {
+                // Call
+                Action call = () => new WaveHeightCalculationService().Calculate(calculation,
+                                                                                 validFilePath,
+                                                                                 norm,
+                                                                                 calculationMessageProvider);
+
+                // Assert
+                TestHelper.AssertLogMessagesAndLoggedExceptions(call, messages =>
+                {
+                    Tuple<string, Level, Exception>[] tupleArray = messages.ToArray();
+
+                    string[] msgs = tupleArray.Select(tuple => tuple.Item1).ToArray();
+                    Assert.AreEqual(4, msgs.Length);
+
+                    CalculationServiceTestHelper.AssertCalculationStartMessage(msgs[0]);
+                    Assert.AreEqual("Het uitlezen van illustratiepunten is mislukt.", msgs[1]);
+                    Assert.AreEqual($"Golfhoogte berekening is uitgevoerd op de tijdelijke locatie '{calculator.OutputDirectory}'. " +
+                                    "Gedetailleerde invoer en uitvoer kan in de bestanden op deze locatie worden gevonden.", msgs[2]);
+                    CalculationServiceTestHelper.AssertCalculationEndMessage(msgs[3]);
+
+                    Assert.IsInstanceOf<IllustrationPointConversionException>(tupleArray[1].Item3);
+                });
+
+                AssessmentLevelCalculationInput expectedInput = CreateInput(id, norm);
+                AssertInput(expectedInput, calculator.ReceivedInputs.Single());
+                Assert.IsFalse(calculator.IsCanceled);
+                Assert.IsNotNull(calculation.Output);
+                Assert.IsFalse(calculation.Output.HasIllustrationPoints);
+            }
+            mockRepository.VerifyAll();
+        }
+
+        [Test]
         public void Calculate_ValidWaveHeightCalculationThrowsException_ThrowsHydraRingFileParserException()
         {
             // Setup
Index: Ringtoets/Common/test/Ringtoets.Common.Service.Test/app.config
===================================================================
diff -u
--- Ringtoets/Common/test/Ringtoets.Common.Service.Test/app.config	(revision 0)
+++ Ringtoets/Common/test/Ringtoets.Common.Service.Test/app.config	(revision 797860a90e2e806327a86f77e20a368eaf25d6ed)
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright (C) Stichting Deltares 2017. All rights reserved.
+
+This file is part of Ringtoets.
+
+Ringtoets is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+All names, logos, and references to "Deltares" are registered trademarks of
+Stichting Deltares and remain full property of Stichting Deltares at all times.
+All rights reserved.
+-->
+<configuration>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="System.Data.SQLite" publicKeyToken="db937bc2d44ff139" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.0.104.0" newVersion="1.0.104.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>
\ No newline at end of file
Index: Ringtoets/Common/test/Ringtoets.Common.Service.Test/packages.config
===================================================================
diff -u -rb3b6c13cf736c134476b3db34281332d01ca86b1 -r797860a90e2e806327a86f77e20a368eaf25d6ed
--- Ringtoets/Common/test/Ringtoets.Common.Service.Test/packages.config	(.../packages.config)	(revision b3b6c13cf736c134476b3db34281332d01ca86b1)
+++ Ringtoets/Common/test/Ringtoets.Common.Service.Test/packages.config	(.../packages.config)	(revision 797860a90e2e806327a86f77e20a368eaf25d6ed)
@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?><!--
+<?xml version="1.0" encoding="utf-8"?>
+<!--
 Copyright (C) Stichting Deltares 2017. All rights reserved.
 
 This file is part of Ringtoets.
@@ -21,6 +22,7 @@
 All rights reserved.
 -->
 <packages>
+  <package id="log4net" version="2.0.4" targetFramework="net40" />
   <package id="NUnit" version="3.6.0" targetFramework="net40" />
   <package id="RhinoMocks" version="3.6.1" targetFramework="net40" />
   <package id="System.Data.SQLite.Core" version="1.0.104.0" targetFramework="net40" />
Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.TestUtil.Test/IllustrationPoints/TestGeneralResultTest.cs
===================================================================
diff -u -r66a40e718fdf95596f8897d81af4a1a0144cfae4 -r797860a90e2e806327a86f77e20a368eaf25d6ed
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.TestUtil.Test/IllustrationPoints/TestGeneralResultTest.cs	(.../TestGeneralResultTest.cs)	(revision 66a40e718fdf95596f8897d81af4a1a0144cfae4)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.TestUtil.Test/IllustrationPoints/TestGeneralResultTest.cs	(.../TestGeneralResultTest.cs)	(revision 797860a90e2e806327a86f77e20a368eaf25d6ed)
@@ -19,6 +19,8 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
+using System.Collections.Generic;
+using System.Linq;
 using NUnit.Framework;
 using Ringtoets.HydraRing.Calculation.Data.Output.IllustrationPoints;
 using Ringtoets.HydraRing.Calculation.TestUtil.IllustrationPoints;
@@ -40,17 +42,34 @@
 
             var expectedWindDirection = new TestWindDirection();
             AssertWindDirection(expectedWindDirection, generalResult.GoverningWindDirection);
-            Assert.IsEmpty(generalResult.Stochasts);
-            Assert.IsEmpty(generalResult.IllustrationPoints);
+            CollectionAssert.IsEmpty(generalResult.Stochasts);
+            CollectionAssert.IsEmpty(generalResult.IllustrationPoints);
         }
 
+        [Test]
+        public void CreateGeneralResultWithFaultTreeIllustrationPoints_ExpectedProperties()
+        {
+            // Call
+            TestGeneralResult generalResult = TestGeneralResult.CreateGeneralResultWithFaultTreeIllustrationPoints();
+
+            // Assert
+            Assert.IsInstanceOf<GeneralResult>(generalResult);
+            Assert.AreEqual(0, generalResult.Beta);
+
+            var expectedWindDirection = new TestWindDirection();
+            AssertWindDirection(expectedWindDirection, generalResult.GoverningWindDirection);
+            CollectionAssert.IsEmpty(generalResult.Stochasts);
+
+            KeyValuePair<WindDirectionClosingSituation, IllustrationPointTreeNode> topLevelIllustrationPoint =
+                generalResult.IllustrationPoints.Single();
+            WindDirectionClosingSituation actualWindDirectionClosingSituation = topLevelIllustrationPoint.Key;
+            AssertWindDirection(expectedWindDirection, actualWindDirectionClosingSituation.WindDirection);
+            Assert.AreEqual("closing situation", actualWindDirectionClosingSituation.ClosingSituation);
+            Assert.IsInstanceOf<FaultTreeIllustrationPoint>(topLevelIllustrationPoint.Value.Data);
+        }
+
         private static void AssertWindDirection(WindDirection expected, WindDirection actual)
         {
-            if (expected == null)
-            {
-                Assert.IsNull(actual);
-                return;
-            }
             Assert.AreEqual(expected.Name, actual.Name);
             Assert.AreEqual(expected.Angle, actual.Angle);
         }
Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.TestUtil/IllustrationPoints/TestGeneralResult.cs
===================================================================
diff -u -r66a40e718fdf95596f8897d81af4a1a0144cfae4 -r797860a90e2e806327a86f77e20a368eaf25d6ed
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.TestUtil/IllustrationPoints/TestGeneralResult.cs	(.../TestGeneralResult.cs)	(revision 66a40e718fdf95596f8897d81af4a1a0144cfae4)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.TestUtil/IllustrationPoints/TestGeneralResult.cs	(.../TestGeneralResult.cs)	(revision 797860a90e2e806327a86f77e20a368eaf25d6ed)
@@ -38,5 +38,20 @@
                    new TestWindDirection(),
                    Enumerable.Empty<Stochast>(),
                    new Dictionary<WindDirectionClosingSituation, IllustrationPointTreeNode>()) {}
+
+        /// <summary>
+        /// Creates a new instance of <see cref="TestGeneralResult"/> with only fault tree
+        /// illustration points.
+        /// </summary>
+        /// <returns>A <see cref="TestGeneralResult"/> with fault tree illustration points.</returns>
+        public static TestGeneralResult CreateGeneralResultWithFaultTreeIllustrationPoints()
+        {
+            var generalResult = new TestGeneralResult();
+
+            generalResult.IllustrationPoints.Add(new WindDirectionClosingSituation(new TestWindDirection(), "closing situation"),
+                                                 new IllustrationPointTreeNode(new TestFaultTreeIllustrationPoint()));
+
+            return generalResult;
+        }
     }
 }
\ No newline at end of file