Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Service.Test/ClosingStructuresCalculationServiceTest.cs
===================================================================
diff -u -r3e2b418a9bbc27e2e990b15325b1350e6d56dc3d -rc02c9b760b98de153f8c7a1bcc1ae39aab23dfb2
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Service.Test/ClosingStructuresCalculationServiceTest.cs	(.../ClosingStructuresCalculationServiceTest.cs)	(revision 3e2b418a9bbc27e2e990b15325b1350e6d56dc3d)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Service.Test/ClosingStructuresCalculationServiceTest.cs	(.../ClosingStructuresCalculationServiceTest.cs)	(revision c02c9b760b98de153f8c7a1bcc1ae39aab23dfb2)
@@ -36,6 +36,7 @@
 using Ringtoets.HydraRing.Calculation.Calculator.Factory;
 using Ringtoets.HydraRing.Calculation.Data;
 using Ringtoets.HydraRing.Calculation.Data.Input.Structures;
+using Ringtoets.HydraRing.Calculation.Parsers;
 using Ringtoets.HydraRing.Calculation.TestUtil;
 using Ringtoets.HydraRing.Calculation.TestUtil.Calculator;
 using Ringtoets.HydraRing.Data;
@@ -69,8 +70,9 @@
                 }
             };
 
-            // Call
             bool isValid = false;
+
+            // Call
             Action call = () => isValid = ClosingStructuresCalculationService.Validate(calculation, assessmentSectionStub);
 
             // Assert
@@ -108,8 +110,9 @@
                 }
             };
 
-            // Call
             bool isValid = false;
+
+            // Call
             Action call = () => isValid = ClosingStructuresCalculationService.Validate(calculation, assessmentSectionStub);
 
             // Assert
@@ -156,12 +159,16 @@
             using (new HydraRingCalculatorFactoryConfig())
             {
                 var calculator = ((TestHydraRingCalculatorFactory) HydraRingCalculatorFactory.Instance).StructuresClosureCalculator;
+
+                // Call
                 TestDelegate call = () => service.Calculate(calculation,
                                                             assessmentSectionStub,
                                                             closingStructuresFailureMechanism,
                                                             testDataPath);
 
                 StructuresClosureCalculationInput[] calculationInputs = calculator.ReceivedInputs.ToArray();
+
+                // Assert
                 Assert.AreEqual(0, calculationInputs.Length);
                 var exception = Assert.Throws<NotSupportedException>(call);
                 Assert.AreEqual("ClosingStructureInflowModelType", exception.Message);
@@ -530,7 +537,7 @@
                                                                         closingStructuresFailureMechanism,
                                                                         testDataPath);
                 }
-                catch
+                catch (HydraRingFileParserException)
                 {
                     exception = true;
                 }
@@ -567,7 +574,7 @@
                 new Point2D(0, 0),
                 new Point2D(1, 1)
             }));
-  
+
             var calculation = new TestClosingStructuresCalculation()
             {
                 InputParameters =