Index: Ringtoets/Common/src/Ringtoets.Common.Service/WaveHeightCalculationService.cs
===================================================================
diff -u -r72e8e672bbfb506c8a9b71b8999591bae5cbafe7 -r19d976fb7e64bc4c23ca6a601eb47d876b1fecff
--- Ringtoets/Common/src/Ringtoets.Common.Service/WaveHeightCalculationService.cs	(.../WaveHeightCalculationService.cs)	(revision 72e8e672bbfb506c8a9b71b8999591bae5cbafe7)
+++ Ringtoets/Common/src/Ringtoets.Common.Service/WaveHeightCalculationService.cs	(.../WaveHeightCalculationService.cs)	(revision 19d976fb7e64bc4c23ca6a601eb47d876b1fecff)
@@ -189,44 +189,40 @@
                 return;
             }
 
+            GeneralResult<TopLevelSubMechanismIllustrationPoint> generalResult = waveHeightCalculation.CalculateIllustrationPoints
+                                                                                     ? GetGeneralResult(calculator.IllustrationPointsResult)
+                                                                                     : null;
+
             HydraulicBoundaryLocationOutput hydraulicBoundaryLocationOutput = CreateHydraulicBoundaryLocationOutput(
-                messageProvider, waveHeightCalculation.Name, calculationInput.Beta, norm, calculator.Converged);
+                messageProvider, waveHeightCalculation.Name, calculationInput.Beta, norm, calculator.Converged, generalResult);
 
-            if (waveHeightCalculation.CalculateIllustrationPoints)
-            {
-                SetGeneralResult(hydraulicBoundaryLocationOutput, calculator.IllustrationPointsResult);
-            }
-
             waveHeightCalculation.Output = hydraulicBoundaryLocationOutput;
         }
 
         /// <summary>
-        /// Sets a <see cref="GeneralResult{T}"/> based on the information 
-        /// of <paramref name="hydraRingGeneralResult"/> to the <paramref name="hydraulicBoundaryLocationOutput"/>.
+        /// Gets a <see cref="GeneralResult{T}"/> based on the information of <paramref name="hydraRingGeneralResult"/>.
         /// </summary>
-        /// <param name="hydraulicBoundaryLocationOutput">The <see cref="HydraulicBoundaryLocationOutput"/> 
-        /// for which to set the <see cref="GeneralResult{T}"/>.</param>
         /// <param name="hydraRingGeneralResult">The <see cref="HydraRingGeneralResult"/> to base the 
         /// <see cref="GeneralResult{T}"/> to create on.</param>
-        private void SetGeneralResult(HydraulicBoundaryLocationOutput hydraulicBoundaryLocationOutput,
-                                                 HydraRingGeneralResult hydraRingGeneralResult)
+        /// <returns>A <see cref="GeneralResult{T}"/>.</returns>
+        private GeneralResult<TopLevelSubMechanismIllustrationPoint> GetGeneralResult(HydraRingGeneralResult hydraRingGeneralResult)
         {
             if (hydraRingGeneralResult == null)
             {
                 log.Warn(calculator.IllustrationPointsParserErrorMessage);
-                return;
+                return null;
             }
 
             try
             {
-                GeneralResult<TopLevelSubMechanismIllustrationPoint> generalResult =
-                    GeneralResultConverter.ConvertToGeneralResultTopLevelSubMechanismIllustrationPoint(hydraRingGeneralResult);
-                hydraulicBoundaryLocationOutput.SetGeneralResult(generalResult);
+                return GeneralResultConverter.ConvertToGeneralResultTopLevelSubMechanismIllustrationPoint(hydraRingGeneralResult);
             }
             catch (IllustrationPointConversionException e)
             {
                 log.Warn(Resources.SetGeneralResult_Converting_IllustrationPointResult_Failed, e);
             }
+
+            return null;
         }
 
         /// <summary>
@@ -237,6 +233,7 @@
         /// <param name="targetReliability">The target reliability for the calculation.</param>
         /// <param name="targetProbability">The target probability for the calculation.</param>
         /// <param name="calculatorConverged">The value indicating whether the calculation converged.</param>
+        /// <param name="generalResult">The general result with illustration points.</param>
         /// <returns>A <see cref="HydraulicBoundaryLocationOutput"/>.</returns>
         /// <exception cref="ArgumentOutOfRangeException">Thrown when <paramref name="targetProbability"/> 
         /// or the calculated probability falls outside the [0.0, 1.0] range and is not <see cref="double.NaN"/>.</exception>
@@ -245,7 +242,8 @@
             string hydraulicBoundaryLocationName,
             double targetReliability,
             double targetProbability,
-            bool? calculatorConverged)
+            bool? calculatorConverged,
+            GeneralResult<TopLevelSubMechanismIllustrationPoint> generalResult)
         {
             double waveHeight = calculator.WaveHeight;
             double reliability = calculator.ReliabilityIndex;
@@ -260,7 +258,7 @@
 
             return new HydraulicBoundaryLocationOutput(waveHeight, targetProbability,
                                                        targetReliability, probability, reliability,
-                                                       converged);
+                                                       converged, generalResult);
         }
 
         /// <summary>