Index: Riskeer/Integration/src/Riskeer.Integration.Plugin/RiskeerPlugin.cs
===================================================================
diff -u -r0b15583abe391e443f25a0244e1ed2ef473cd2b9 -r07b41fc96a44c333477afa1f13ee0a3c725a4fb5
--- Riskeer/Integration/src/Riskeer.Integration.Plugin/RiskeerPlugin.cs	(.../RiskeerPlugin.cs)	(revision 0b15583abe391e443f25a0244e1ed2ef473cd2b9)
+++ Riskeer/Integration/src/Riskeer.Integration.Plugin/RiskeerPlugin.cs	(.../RiskeerPlugin.cs)	(revision 07b41fc96a44c333477afa1f13ee0a3c725a4fb5)
@@ -2390,12 +2390,6 @@
             };
         }
 
-        private static bool HasIllustrationPoints(IAssessmentSection assessmentSection)
-        {
-            return DesignWaterLevelCalculationsHaveIllustrationPoints(assessmentSection)
-                   || WaveHeightCalculationsHaveIllustrationPoints(assessmentSection);
-        }
-
         private static bool WaveHeightCalculationsHaveIllustrationPoints(IAssessmentSection assessmentSection)
         {
             return IllustrationPointsHelper.HasIllustrationPoints(assessmentSection.WaveHeightCalculationsForFactorizedSignalingNorm)
@@ -2412,6 +2406,31 @@
                    || IllustrationPointsHelper.HasIllustrationPoints(assessmentSection.WaterLevelCalculationsForLowerLimitNorm);
         }
 
+        private static bool HasIllustrationPoints(IAssessmentSection assessmentSection)
+        {
+            return WaterLevelCalculationsForNormTargetProbabilitiesHaveIllustrationPoints(assessmentSection)
+                   || WaterLevelCalculationsForUserDefinedTargetProbabilitiesHaveIllustrationPoints(assessmentSection)
+                   || WaveHeightCalculationsForUserDefinedTargetProbabilitiesHaveIllustrationPoints(assessmentSection);
+        }
+
+        private static bool WaterLevelCalculationsForNormTargetProbabilitiesHaveIllustrationPoints(IAssessmentSection assessmentSection)
+        {
+            return IllustrationPointsHelper.HasIllustrationPoints(assessmentSection.WaterLevelCalculationsForSignalingNorm)
+                   || IllustrationPointsHelper.HasIllustrationPoints(assessmentSection.WaterLevelCalculationsForLowerLimitNorm);
+        }
+
+        private static bool WaterLevelCalculationsForUserDefinedTargetProbabilitiesHaveIllustrationPoints(IAssessmentSection assessmentSection)
+        {
+            return assessmentSection.WaterLevelCalculationsForUserDefinedTargetProbabilities
+                                    .Any(wlc => IllustrationPointsHelper.HasIllustrationPoints(wlc.HydraulicBoundaryLocationCalculations));
+        }
+
+        private static bool WaveHeightCalculationsForUserDefinedTargetProbabilitiesHaveIllustrationPoints(IAssessmentSection assessmentSection)
+        {
+            return assessmentSection.WaveHeightCalculationsForUserDefinedTargetProbabilities
+                                    .Any(whc => IllustrationPointsHelper.HasIllustrationPoints(whc.HydraulicBoundaryLocationCalculations));
+        }
+
         #endregion
 
         #region AssemblyResults TreeNodeInfo