Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsGuiPlugin.cs
===================================================================
diff -u -r261bbc6b1f16b951a12123626a914fe764ac31d0 -r20bb156dfc129b1602ddbcddc73c0806807f19ab
--- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsGuiPlugin.cs	(.../RingtoetsGuiPlugin.cs)	(revision 261bbc6b1f16b951a12123626a914fe764ac31d0)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsGuiPlugin.cs	(.../RingtoetsGuiPlugin.cs)	(revision 20bb156dfc129b1602ddbcddc73c0806807f19ab)
@@ -53,6 +53,7 @@
 using Ringtoets.HydraRing.Calculation.Data.Output;
 using Ringtoets.HydraRing.Data;
 using Ringtoets.HydraRing.IO;
+using Ringtoets.Integration.Data;
 using Ringtoets.Integration.Data.StandAlone;
 using Ringtoets.Integration.Forms.PresentationObjects;
 using Ringtoets.Integration.Forms.PropertyClasses;
@@ -455,58 +456,15 @@
         {
             foreach (IFailureMechanism failureMechanism in nodeData.GetFailureMechanisms())
             {
-                var closingStructureFailureMechanism = failureMechanism as ClosingStructureFailureMechanism;
-                var duneErosionFailureMechanism = failureMechanism as DuneErosionFailureMechanism;
-                var grassCoverErosionOutwardsFailureMechanism = failureMechanism as GrassCoverErosionOutwardsFailureMechanism;
-                var grassCoverSlipOffOutwardsFailureMechanism = failureMechanism as GrassCoverSlipOffOutwardsFailureMechanism;
-                var macroStabilityInwardsFailureMechanism = failureMechanism as MacroStabilityInwardsFailureMechanism;
-                var pipingStructureFailureMechanism = failureMechanism as PipingStructureFailureMechanism;
-                var stabilityStoneCoverFailureMechanism = failureMechanism as StabilityStoneCoverFailureMechanism;
-                var strengthStabilityPointConstructionFailureMechanism = failureMechanism as StrengthStabilityPointConstructionFailureMechanism;
-                var waveImpactAsphaltCoverFailureMechanism = failureMechanism as WaveImpactAsphaltCoverFailureMechanism;
-
                 var piping = failureMechanism as PipingFailureMechanism;
                 var grassCoverErosionInwards = failureMechanism as GrassCoverErosionInwardsFailureMechanism;
                 var heightStructuresFailureMechanism = failureMechanism as HeightStructuresFailureMechanism;
 
-                if (closingStructureFailureMechanism != null)
+                var customFailureMechanism = failureMechanism as IHasSectionResults<CustomFailureMechanismSectionResult>;
+                var simpleFailureMechanism = failureMechanism as IHasSectionResults<SimpleFailureMechanismSectionResult>;
+
+                if (piping != null)
                 {
-                    yield return new CustomFailureMechanismContext(closingStructureFailureMechanism, nodeData);
-                }
-                else if (duneErosionFailureMechanism != null)
-                {
-                    yield return new SimpleFailureMechanismContext(duneErosionFailureMechanism, nodeData);
-                }
-                else if (grassCoverErosionOutwardsFailureMechanism != null)
-                {
-                    yield return new SimpleFailureMechanismContext(grassCoverErosionOutwardsFailureMechanism, nodeData);
-                }
-                else if (grassCoverSlipOffOutwardsFailureMechanism != null)
-                {
-                    yield return new SimpleFailureMechanismContext(grassCoverSlipOffOutwardsFailureMechanism, nodeData);
-                }
-                else if (macroStabilityInwardsFailureMechanism != null)
-                {
-                    yield return new CustomFailureMechanismContext(macroStabilityInwardsFailureMechanism, nodeData);
-                }
-                else if (pipingStructureFailureMechanism != null)
-                {
-                    yield return new SimpleFailureMechanismContext(pipingStructureFailureMechanism, nodeData);
-                }
-                else if (stabilityStoneCoverFailureMechanism != null)
-                {
-                    yield return new CustomFailureMechanismContext(stabilityStoneCoverFailureMechanism, nodeData);
-                }
-                else if (strengthStabilityPointConstructionFailureMechanism != null)
-                {
-                    yield return new CustomFailureMechanismContext(strengthStabilityPointConstructionFailureMechanism, nodeData);
-                }
-                else if (waveImpactAsphaltCoverFailureMechanism != null)
-                {
-                    yield return new CustomFailureMechanismContext(waveImpactAsphaltCoverFailureMechanism, nodeData);
-                }
-                else if (piping != null)
-                {
                     yield return new PipingFailureMechanismContext(piping, nodeData);
                 }
                 else if (grassCoverErosionInwards != null)
@@ -517,6 +475,14 @@
                 {
                     yield return new HeightStructuresFailureMechanismContext(heightStructuresFailureMechanism, nodeData);
                 }
+                else if (customFailureMechanism != null)
+                {
+                    yield return new CustomFailureMechanismContext(customFailureMechanism as IFailureMechanism, nodeData);
+                }
+                else if (simpleFailureMechanism != null)
+                {
+                    yield return new SimpleFailureMechanismContext(simpleFailureMechanism as IFailureMechanism, nodeData);
+                }
                 else
                 {
                     throw new NotImplementedException();