Index: Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingFailureMechanismSection2aAssessmentResultExtensions.cs
===================================================================
diff -u -r06abcaadc2936c0bf3fde73916c051f37f698505 -r56ec7114c4c96eeee4a1bb16d0ecac2bb10a49b8
--- Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingFailureMechanismSection2aAssessmentResultExtensions.cs	(.../PipingFailureMechanismSection2aAssessmentResultExtensions.cs)	(revision 06abcaadc2936c0bf3fde73916c051f37f698505)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingFailureMechanismSection2aAssessmentResultExtensions.cs	(.../PipingFailureMechanismSection2aAssessmentResultExtensions.cs)	(revision 56ec7114c4c96eeee4a1bb16d0ecac2bb10a49b8)
@@ -19,8 +19,8 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
-using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.Linq;
 using Core.Common.Base.Data;
 using Core.Common.Base.Geometry;
@@ -97,7 +97,9 @@
                     case CalculationScenarioStatus.Done:
                         continue;
                     default:
-                        throw new ArgumentOutOfRangeException();
+                        throw new InvalidEnumArgumentException("pipingFailureMechanismSectionResult",
+                                                               (int) calculationScenario.Status,
+                                                               typeof(CalculationScenarioStatus));
                 }
             }