Index: Ringtoets/Common/src/Ringtoets.Common.IO/FileImporters/CalculationConfigurationImporter.cs
===================================================================
diff -u -r5e9837463c9e1f6fcf8404b943e374650586f99e -r8f228044569bcff77f25f658a7e5277e78b6b6a8
--- Ringtoets/Common/src/Ringtoets.Common.IO/FileImporters/CalculationConfigurationImporter.cs	(.../CalculationConfigurationImporter.cs)	(revision 5e9837463c9e1f6fcf8404b943e374650586f99e)
+++ Ringtoets/Common/src/Ringtoets.Common.IO/FileImporters/CalculationConfigurationImporter.cs	(.../CalculationConfigurationImporter.cs)	(revision 8f228044569bcff77f25f658a7e5277e78b6b6a8)
@@ -22,6 +22,7 @@
 using System;
 using System.Collections.Generic;
 using Core.Common.Base.IO;
+using Core.Common.IO.Exceptions;
 using Core.Common.IO.Readers;
 using log4net;
 using Ringtoets.Common.Data.Calculation;
@@ -89,8 +90,27 @@
 
         protected abstract ICalculationBase ProcessReadItem(IReadConfigurationItem readItem);
 
-        protected abstract ReadResult<IReadConfigurationItem> ReadConfiguration();
+        protected abstract ICollection<IReadConfigurationItem> ReadConfigurationItems(string filePath);
 
+        private ReadResult<IReadConfigurationItem> ReadConfiguration()
+        {
+            try
+            {
+                return new ReadResult<IReadConfigurationItem>(false)
+                {
+                    Items = ReadConfigurationItems(FilePath)
+                };
+            }
+            catch (Exception exception) when (exception is ArgumentException
+                                              || exception is CriticalFileReadException)
+            {
+                string errorMessage = string.Format(Resources.CalculationConfigurationImporter_HandleCriticalFileReadError_Error_0_no_configuration_imported,
+                                                    exception.Message);
+                log.Error(errorMessage, exception);
+                return new ReadResult<IReadConfigurationItem>(true);
+            }
+        }
+
         private void AddItemsToModel(IEnumerable<ICalculationBase> validCalculationItems)
         {
             foreach (ICalculationBase validCalculationItem in validCalculationItems)
Index: Ringtoets/Common/src/Ringtoets.Common.IO/Properties/Resources.Designer.cs
===================================================================
diff -u -rb84f4b9c37b5ce0bd49b65269c4984c0bc1543e8 -r8f228044569bcff77f25f658a7e5277e78b6b6a8
--- Ringtoets/Common/src/Ringtoets.Common.IO/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision b84f4b9c37b5ce0bd49b65269c4984c0bc1543e8)
+++ Ringtoets/Common/src/Ringtoets.Common.IO/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 8f228044569bcff77f25f658a7e5277e78b6b6a8)
@@ -82,6 +82,17 @@
         }
         
         /// <summary>
+        ///   Looks up a localized string similar to {0} 
+        ///Er is geen berekeningenconfiguratie geïmporteerd..
+        /// </summary>
+        public static string CalculationConfigurationImporter_HandleCriticalFileReadError_Error_0_no_configuration_imported {
+            get {
+                return ResourceManager.GetString("CalculationConfigurationImporter_HandleCriticalFileReadError_Error_0_no_configura" +
+                        "tion_imported", resourceCulture);
+            }
+        }
+        
+        /// <summary>
         ///   Looks up a localized string similar to Berekeningenconfiguratie importeren afgebroken. Geen data ingelezen..
         /// </summary>
         public static string CalculationConfigurationImporter_LogImportCanceledMessage_Import_canceled_no_data_read {
Index: Ringtoets/Common/src/Ringtoets.Common.IO/Properties/Resources.resx
===================================================================
diff -u -rb84f4b9c37b5ce0bd49b65269c4984c0bc1543e8 -r8f228044569bcff77f25f658a7e5277e78b6b6a8
--- Ringtoets/Common/src/Ringtoets.Common.IO/Properties/Resources.resx	(.../Resources.resx)	(revision b84f4b9c37b5ce0bd49b65269c4984c0bc1543e8)
+++ Ringtoets/Common/src/Ringtoets.Common.IO/Properties/Resources.resx	(.../Resources.resx)	(revision 8f228044569bcff77f25f658a7e5277e78b6b6a8)
@@ -534,6 +534,10 @@
   <data name="CalculationConfigurationImporter_ProgressText_Validating_imported_data" xml:space="preserve">
     <value>Valideren berekeningenconfiguratie.</value>
   </data>
+  <data name="CalculationConfigurationImporter_HandleCriticalFileReadError_Error_0_no_configuration_imported" xml:space="preserve">
+    <value>{0} 
+Er is geen berekeningenconfiguratie geïmporteerd.</value>
+  </data>
   <data name="GolfReductieSchema" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\GolfReductieSchema.xsd;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
   </data>
Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/FileImporters/CalculationConfigurationImporterTest.cs
===================================================================
diff -u -r5e9837463c9e1f6fcf8404b943e374650586f99e -r8f228044569bcff77f25f658a7e5277e78b6b6a8
--- Ringtoets/Common/test/Ringtoets.Common.IO.Test/FileImporters/CalculationConfigurationImporterTest.cs	(.../CalculationConfigurationImporterTest.cs)	(revision 5e9837463c9e1f6fcf8404b943e374650586f99e)
+++ Ringtoets/Common/test/Ringtoets.Common.IO.Test/FileImporters/CalculationConfigurationImporterTest.cs	(.../CalculationConfigurationImporterTest.cs)	(revision 8f228044569bcff77f25f658a7e5277e78b6b6a8)
@@ -20,6 +20,7 @@
 // All rights reserved.
 
 using System;
+using System.Collections.Generic;
 using Core.Common.Base.IO;
 using Core.Common.IO.Readers;
 using Core.Common.TestUtil;
@@ -82,7 +83,7 @@
                 throw new NotImplementedException();
             }
 
-            protected override ReadResult<IReadConfigurationItem> ReadConfiguration()
+            protected override ICollection<IReadConfigurationItem> ReadConfigurationItems(string filePath)
             {
                 throw new NotImplementedException();
             }
Index: Ringtoets/Piping/src/Ringtoets.Piping.IO/Importers/PipingConfigurationImporter.cs
===================================================================
diff -u -r00a84201fe2817433be9aee8c4e670c608fcb4c7 -r8f228044569bcff77f25f658a7e5277e78b6b6a8
--- Ringtoets/Piping/src/Ringtoets.Piping.IO/Importers/PipingConfigurationImporter.cs	(.../PipingConfigurationImporter.cs)	(revision 00a84201fe2817433be9aee8c4e670c608fcb4c7)
+++ Ringtoets/Piping/src/Ringtoets.Piping.IO/Importers/PipingConfigurationImporter.cs	(.../PipingConfigurationImporter.cs)	(revision 8f228044569bcff77f25f658a7e5277e78b6b6a8)
@@ -23,8 +23,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using Core.Common.Base.Data;
-using Core.Common.IO.Exceptions;
-using Core.Common.IO.Readers;
 using log4net;
 using Ringtoets.Common.Data.Calculation;
 using Ringtoets.Common.Data.Hydraulics;
@@ -81,25 +79,6 @@
             this.failureMechanism = failureMechanism;
         }
 
-        protected override ReadResult<IReadConfigurationItem> ReadConfiguration()
-        {
-            try
-            {
-                return new ReadResult<IReadConfigurationItem>(false)
-                {
-                    Items = new PipingConfigurationReader(FilePath).Read().ToList()
-                };
-            }
-            catch (Exception exception) when (exception is ArgumentException
-                                              || exception is CriticalFileReadException)
-            {
-                string errorMessage = string.Format(Resources.PipingConfigurationImporter_HandleCriticalFileReadError_Error_0_no_configuration_imported,
-                                                    exception.Message);
-                log.Error(errorMessage, exception);
-                return new ReadResult<IReadConfigurationItem>(true);
-            }
-        }
-
         protected override ICalculationBase ProcessReadItem(IReadConfigurationItem readItem)
         {
             var readCalculationGroup = readItem as ReadCalculationGroup;
@@ -117,6 +96,11 @@
             return null;
         }
 
+        protected override ICollection<IReadConfigurationItem> ReadConfigurationItems(string filePath)
+        {
+            return new PipingConfigurationReader(FilePath).Read().ToList();
+        }
+
         private CalculationGroup ProcessCalculationGroup(ReadCalculationGroup readCalculationGroup)
         {
             var group = new CalculationGroup(readCalculationGroup.Name, true);
Index: Ringtoets/Piping/src/Ringtoets.Piping.IO/Properties/Resources.Designer.cs
===================================================================
diff -u -r00a84201fe2817433be9aee8c4e670c608fcb4c7 -r8f228044569bcff77f25f658a7e5277e78b6b6a8
--- Ringtoets/Piping/src/Ringtoets.Piping.IO/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 00a84201fe2817433be9aee8c4e670c608fcb4c7)
+++ Ringtoets/Piping/src/Ringtoets.Piping.IO/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 8f228044569bcff77f25f658a7e5277e78b6b6a8)
@@ -215,17 +215,6 @@
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to {0} 
-        ///Er is geen berekeningenconfiguratie geïmporteerd..
-        /// </summary>
-        public static string PipingConfigurationImporter_HandleCriticalFileReadError_Error_0_no_configuration_imported {
-            get {
-                return ResourceManager.GetString("PipingConfigurationImporter_HandleCriticalFileReadError_Error_0_no_configuration_" +
-                        "imported", resourceCulture);
-            }
-        }
-        
-        /// <summary>
         ///   Looks up a localized string similar to Een waarde van &apos;{0}&apos; als intredepunt is ongeldig..
         /// </summary>
         public static string PipingConfigurationImporter_ReadEntryExitPoint_Entry_point_invalid {
Index: Ringtoets/Piping/src/Ringtoets.Piping.IO/Properties/Resources.resx
===================================================================
diff -u -r00a84201fe2817433be9aee8c4e670c608fcb4c7 -r8f228044569bcff77f25f658a7e5277e78b6b6a8
--- Ringtoets/Piping/src/Ringtoets.Piping.IO/Properties/Resources.resx	(.../Resources.resx)	(revision 00a84201fe2817433be9aee8c4e670c608fcb4c7)
+++ Ringtoets/Piping/src/Ringtoets.Piping.IO/Properties/Resources.resx	(.../Resources.resx)	(revision 8f228044569bcff77f25f658a7e5277e78b6b6a8)
@@ -278,10 +278,6 @@
   <data name="SoilDatabaseConstraintsReader_VerifyConstraints_Invalid_StochasticSoilProfile_probability" xml:space="preserve">
     <value>Er zijn stochastische ondergrondschematisaties zonder geldige kans van voorkomen.</value>
   </data>
-  <data name="PipingConfigurationImporter_HandleCriticalFileReadError_Error_0_no_configuration_imported" xml:space="preserve">
-    <value>{0} 
-Er is geen berekeningenconfiguratie geïmporteerd.</value>
-  </data>
   <data name="PipingConfigurationImporter_ValidateCalculation_Error_message_0_calculation_1_skipped" xml:space="preserve">
     <value>{0} Berekening '{1}' is overgeslagen.</value>
   </data>
Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Importers/PipingConfigurationImporterTest.cs
===================================================================
diff -u -rfc204f9f1958c10c27c00e43fc2dba43565f7b35 -r8f228044569bcff77f25f658a7e5277e78b6b6a8
--- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Importers/PipingConfigurationImporterTest.cs	(.../PipingConfigurationImporterTest.cs)	(revision fc204f9f1958c10c27c00e43fc2dba43565f7b35)
+++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Importers/PipingConfigurationImporterTest.cs	(.../PipingConfigurationImporterTest.cs)	(revision 8f228044569bcff77f25f658a7e5277e78b6b6a8)
@@ -20,12 +20,10 @@
 // All rights reserved.
 
 using System;
-using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using Core.Common.Base.Data;
 using Core.Common.Base.Geometry;
-using Core.Common.Base.IO;
 using Core.Common.TestUtil;
 using NUnit.Framework;
 using Ringtoets.Common.Data.Calculation;