Index: Ringtoets/Common/src/Ringtoets.Common.IO/FileImporters/CalculationConfigurationImporter.cs
===================================================================
diff -u -r309837df48178bbae93c412badfda6c0de5da6a4 -rb40e1caf8e1268f372546679797d55944e3ac1fd
--- Ringtoets/Common/src/Ringtoets.Common.IO/FileImporters/CalculationConfigurationImporter.cs	(.../CalculationConfigurationImporter.cs)	(revision 309837df48178bbae93c412badfda6c0de5da6a4)
+++ Ringtoets/Common/src/Ringtoets.Common.IO/FileImporters/CalculationConfigurationImporter.cs	(.../CalculationConfigurationImporter.cs)	(revision b40e1caf8e1268f372546679797d55944e3ac1fd)
@@ -26,6 +26,7 @@
 using Core.Common.IO.Readers;
 using log4net;
 using Ringtoets.Common.Data.Calculation;
+using Ringtoets.Common.IO.Exceptions;
 using Ringtoets.Common.IO.Properties;
 using Ringtoets.Common.IO.Readers;
 
@@ -124,7 +125,7 @@
             var readCalculation = readItem as TReadCalculation;
             if (readCalculation != null)
             {
-                return ProcessCalculation(readCalculation);
+                return ProcessCalculationInternal(readCalculation);
             }
 
             return null;
@@ -146,6 +147,22 @@
             return group;
         }
 
+        private ICalculationBase ProcessCalculationInternal(TReadCalculation readCalculation)
+        {
+            try
+            {
+                return ProcessCalculation(readCalculation);
+            }
+            catch (CriticalFileValidationException e)
+            {
+                string message = string.Format(Resources.CalculationConfigurationImporter_ValidateCalculation_Error_message_0_calculation_1_skipped,
+                                               e.Message,
+                                               readCalculation.Name);
+                log.Error(message, e);
+                return null;
+            }
+        }
+
         private void AddItemsToModel(IEnumerable<ICalculationBase> validCalculationItems)
         {
             foreach (ICalculationBase validCalculationItem in validCalculationItems)
Index: Ringtoets/Common/src/Ringtoets.Common.IO/Properties/Resources.Designer.cs
===================================================================
diff -u -r8f228044569bcff77f25f658a7e5277e78b6b6a8 -rb40e1caf8e1268f372546679797d55944e3ac1fd
--- Ringtoets/Common/src/Ringtoets.Common.IO/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 8f228044569bcff77f25f658a7e5277e78b6b6a8)
+++ Ringtoets/Common/src/Ringtoets.Common.IO/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision b40e1caf8e1268f372546679797d55944e3ac1fd)
@@ -121,6 +121,16 @@
         }
         
         /// <summary>
+        ///   Looks up a localized string similar to {0} Berekening &apos;{1}&apos; is overgeslagen..
+        /// </summary>
+        public static string CalculationConfigurationImporter_ValidateCalculation_Error_message_0_calculation_1_skipped {
+            get {
+                return ResourceManager.GetString("CalculationConfigurationImporter_ValidateCalculation_Error_message_0_calculation_" +
+                        "1_skipped", resourceCulture);
+            }
+        }
+        
+        /// <summary>
         ///   Looks up a localized string similar to &lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-8&quot;?&gt;
         ///
         ///&lt;!--
Index: Ringtoets/Common/src/Ringtoets.Common.IO/Properties/Resources.resx
===================================================================
diff -u -r8f228044569bcff77f25f658a7e5277e78b6b6a8 -rb40e1caf8e1268f372546679797d55944e3ac1fd
--- Ringtoets/Common/src/Ringtoets.Common.IO/Properties/Resources.resx	(.../Resources.resx)	(revision 8f228044569bcff77f25f658a7e5277e78b6b6a8)
+++ Ringtoets/Common/src/Ringtoets.Common.IO/Properties/Resources.resx	(.../Resources.resx)	(revision b40e1caf8e1268f372546679797d55944e3ac1fd)
@@ -538,6 +538,9 @@
     <value>{0} 
 Er is geen berekeningenconfiguratie geïmporteerd.</value>
   </data>
+  <data name="CalculationConfigurationImporter_ValidateCalculation_Error_message_0_calculation_1_skipped" xml:space="preserve">
+    <value>{0} Berekening '{1}' is overgeslagen.</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/Piping/src/Ringtoets.Piping.IO/Importers/PipingConfigurationImporter.cs
===================================================================
diff -u -r309837df48178bbae93c412badfda6c0de5da6a4 -rb40e1caf8e1268f372546679797d55944e3ac1fd
--- Ringtoets/Piping/src/Ringtoets.Piping.IO/Importers/PipingConfigurationImporter.cs	(.../PipingConfigurationImporter.cs)	(revision 309837df48178bbae93c412badfda6c0de5da6a4)
+++ Ringtoets/Piping/src/Ringtoets.Piping.IO/Importers/PipingConfigurationImporter.cs	(.../PipingConfigurationImporter.cs)	(revision b40e1caf8e1268f372546679797d55944e3ac1fd)
@@ -23,7 +23,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using Core.Common.Base.Data;
-using log4net;
 using Ringtoets.Common.Data.Calculation;
 using Ringtoets.Common.Data.Hydraulics;
 using Ringtoets.Common.Data.Probabilistics;
@@ -44,8 +43,6 @@
     /// </summary>
     public class PipingConfigurationImporter : CalculationConfigurationImporter<ReadPipingCalculation>
     {
-        private static readonly ILog log = LogManager.GetLogger(typeof(PipingConfigurationImporter));
-
         private readonly IEnumerable<HydraulicBoundaryLocation> hydraulicBoundaryLocations;
         private readonly PipingFailureMechanism failureMechanism;
 
@@ -90,23 +87,12 @@
                 Name = readCalculation.Name
             };
 
-            try
-            {
-                ReadHydraulicBoundaryData(readCalculation, pipingCalculation);
-                ReadSurfaceLine(readCalculation, pipingCalculation);
-                ReadEntryExitPoint(readCalculation, pipingCalculation);
-                ReadStochasticSoilModel(readCalculation, pipingCalculation);
-                ReadStochasticSoilProfile(readCalculation, pipingCalculation);
-                ReadStochasts(readCalculation, pipingCalculation);
-            }
-            catch (CriticalFileValidationException e)
-            {
-                string message = string.Format(Resources.PipingConfigurationImporter_ValidateCalculation_Error_message_0_calculation_1_skipped,
-                                               e.Message,
-                                               readCalculation.Name);
-                log.Error(message, e);
-                return null;
-            }
+            ReadHydraulicBoundaryData(readCalculation, pipingCalculation);
+            ReadSurfaceLine(readCalculation, pipingCalculation);
+            ReadEntryExitPoint(readCalculation, pipingCalculation);
+            ReadStochasticSoilModel(readCalculation, pipingCalculation);
+            ReadStochasticSoilProfile(readCalculation, pipingCalculation);
+            ReadStochasts(readCalculation, pipingCalculation);
 
             return pipingCalculation;
         }
Index: Ringtoets/Piping/src/Ringtoets.Piping.IO/Properties/Resources.Designer.cs
===================================================================
diff -u -r8f228044569bcff77f25f658a7e5277e78b6b6a8 -rb40e1caf8e1268f372546679797d55944e3ac1fd
--- Ringtoets/Piping/src/Ringtoets.Piping.IO/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 8f228044569bcff77f25f658a7e5277e78b6b6a8)
+++ Ringtoets/Piping/src/Ringtoets.Piping.IO/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision b40e1caf8e1268f372546679797d55944e3ac1fd)
@@ -322,16 +322,6 @@
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to {0} Berekening &apos;{1}&apos; is overgeslagen..
-        /// </summary>
-        public static string PipingConfigurationImporter_ValidateCalculation_Error_message_0_calculation_1_skipped {
-            get {
-                return ResourceManager.GetString("PipingConfigurationImporter_ValidateCalculation_Error_message_0_calculation_1_ski" +
-                        "pped", resourceCulture);
-            }
-        }
-        
-        /// <summary>
         ///   Looks up a localized string similar to Kritieke fout opgetreden bij het uitlezen van waardes uit kolommen in de database..
         /// </summary>
         public static string PipingSoilProfileReader_Critical_Unexpected_value_on_column {
Index: Ringtoets/Piping/src/Ringtoets.Piping.IO/Properties/Resources.resx
===================================================================
diff -u -r8f228044569bcff77f25f658a7e5277e78b6b6a8 -rb40e1caf8e1268f372546679797d55944e3ac1fd
--- Ringtoets/Piping/src/Ringtoets.Piping.IO/Properties/Resources.resx	(.../Resources.resx)	(revision 8f228044569bcff77f25f658a7e5277e78b6b6a8)
+++ Ringtoets/Piping/src/Ringtoets.Piping.IO/Properties/Resources.resx	(.../Resources.resx)	(revision b40e1caf8e1268f372546679797d55944e3ac1fd)
@@ -278,9 +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_ValidateCalculation_Error_message_0_calculation_1_skipped" xml:space="preserve">
-    <value>{0} Berekening '{1}' is overgeslagen.</value>
-  </data>
   <data name="PipingConfigurationImporter_ReadHydraulicBoundaryLocation_Hydraulic_boundary_location_0_does_not_exist" xml:space="preserve">
     <value>De locatie met hydraulische randvoorwaarden '{0}' bestaat niet.</value>
   </data>