Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Parsers/OvertoppingCalculationWaveHeightParser.cs
===================================================================
diff -u -r557c60f6aadb50bcb07503a0f5a1ea34ca6a3885 -r28eca7c7266b51b09790d1dcaa23808283457c46
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Parsers/OvertoppingCalculationWaveHeightParser.cs	(.../OvertoppingCalculationWaveHeightParser.cs)	(revision 557c60f6aadb50bcb07503a0f5a1ea34ca6a3885)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Parsers/OvertoppingCalculationWaveHeightParser.cs	(.../OvertoppingCalculationWaveHeightParser.cs)	(revision 28eca7c7266b51b09790d1dcaa23808283457c46)
@@ -24,7 +24,6 @@
 using System.Globalization;
 using System.IO;
 using System.Linq;
-using Core.Common.Utils;
 using Ringtoets.HydraRing.Calculation.Data.Output;
 using Ringtoets.HydraRing.Calculation.Services;
 
@@ -81,18 +80,24 @@
 
         public void Parse(string workingDirectory, int sectionId)
         {
-            if (workingDirectory == null)
+            try
             {
+                Path.GetFullPath(workingDirectory);
+            }
+            catch (ArgumentNullException)
+            {
                 throw new ArgumentNullException("workingDirectory");
             }
-            FileUtils.ValidateFilePath(workingDirectory);
+            catch
+            {
+                throw new ArgumentException("workingDirectory");
+            }
 
             string fileName = string.Format("{0}{1}", sectionId, HydraRingFileName.OutputFileSuffix);
-            string filePath = Path.Combine(workingDirectory, fileName);
 
             try
             {
-                ReadFile(filePath);
+                ReadFile(Path.Combine(workingDirectory, fileName));
                 SetOutputs();
             }
             catch