Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Application.Ringtoets.Storage.csproj
===================================================================
diff -u -r8404b9bd4e87e4a097a982ddccba6ecfa5aeec32 -r654d3a712eedbdeea718dc0448c5544f09e053cd
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Application.Ringtoets.Storage.csproj	(.../Application.Ringtoets.Storage.csproj)	(revision 8404b9bd4e87e4a097a982ddccba6ecfa5aeec32)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Application.Ringtoets.Storage.csproj	(.../Application.Ringtoets.Storage.csproj)	(revision 654d3a712eedbdeea718dc0448c5544f09e053cd)
@@ -63,7 +63,6 @@
       <Link>Properties\GlobalAssembly.cs</Link>
     </Compile>
     <Compile Include="Exceptions\InvalidFileException.cs" />
-    <Compile Include="Exceptions\FileNotFoundException.cs" />
     <Compile Include="IRingtoetsDBContext.cs" />
     <Compile Include="Converter\ProjectEntityConverter.cs" />
     <Compile Include="ProjectEntity.cs">
@@ -92,12 +91,19 @@
     </Compile>
     <Compile Include="SqLiteStorageConnection.cs" />
     <Compile Include="StorageSqLite.cs" />
+    <Compile Include="Version.cs">
+      <DependentUpon>RingtoetsDBContext.tt</DependentUpon>
+    </Compile>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Base\Core.Common.Base.csproj">
       <Project>{3bbfd65b-b277-4e50-ae6d-bd24c3434609}</Project>
       <Name>Core.Common.Base</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Utils\Core.Common.Utils.csproj">
+      <Project>{F49BD8B2-332A-4C91-A196-8CCE0A2C7D98}</Project>
+      <Name>Core.Common.Utils</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Version\Core.Common.Version.csproj">
       <Project>{c90b77da-e421-43cc-b82e-529651bc21ac}</Project>
       <Name>Core.Common.Version</Name>
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Converter/ProjectEntityConverter.cs
===================================================================
diff -u -r3a8bff057967bdb42389382472f6ce55789a0ced -r654d3a712eedbdeea718dc0448c5544f09e053cd
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Converter/ProjectEntityConverter.cs	(.../ProjectEntityConverter.cs)	(revision 3a8bff057967bdb42389382472f6ce55789a0ced)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Converter/ProjectEntityConverter.cs	(.../ProjectEntityConverter.cs)	(revision 654d3a712eedbdeea718dc0448c5544f09e053cd)
@@ -42,7 +42,7 @@
         /// </summary>
         /// <param name="projectEntity"><see cref="ProjectEntity"/> to convert.</param>
         /// <returns>A new instance of <see cref="Project"/>, based on the properties of <paramref name="projectEntity"/>.</returns>
-        public static Project ProjectEntityToProject( ProjectEntity projectEntity )
+        public static Project ProjectEntityToProject(ProjectEntity projectEntity)
         {
             var project = new Project
             {
@@ -65,6 +65,5 @@
             projectEntity.Description = project.Description;
             projectEntity.LastUpdated = new DateTime().Ticks;
         }
-
     }
-}
+}
\ No newline at end of file
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Ringtoets.rt
===================================================================
diff -u -r8404b9bd4e87e4a097a982ddccba6ecfa5aeec32 -r654d3a712eedbdeea718dc0448c5544f09e053cd
Binary files differ
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/RingtoetsDBContext.Context.cs
===================================================================
diff -u -r3a8bff057967bdb42389382472f6ce55789a0ced -r654d3a712eedbdeea718dc0448c5544f09e053cd
--- Application/Ringtoets/src/Application.Ringtoets.Storage/RingtoetsDBContext.Context.cs	(.../RingtoetsDBContext.Context.cs)	(revision 3a8bff057967bdb42389382472f6ce55789a0ced)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/RingtoetsDBContext.Context.cs	(.../RingtoetsDBContext.Context.cs)	(revision 654d3a712eedbdeea718dc0448c5544f09e053cd)
@@ -27,5 +27,6 @@
         }
     
         public virtual IDbSet<ProjectEntity> ProjectEntities { get; set; }
+        public virtual IDbSet<Version> Versions { get; set; }
     }
 }
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/RingtoetsDBContext.edmx
===================================================================
diff -u -r0155f2f233aefc7951782b302e1398e02c00f298 -r654d3a712eedbdeea718dc0448c5544f09e053cd
--- Application/Ringtoets/src/Application.Ringtoets.Storage/RingtoetsDBContext.edmx	(.../RingtoetsDBContext.edmx)	(revision 0155f2f233aefc7951782b302e1398e02c00f298)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/RingtoetsDBContext.edmx	(.../RingtoetsDBContext.edmx)	(revision 654d3a712eedbdeea718dc0448c5544f09e053cd)
@@ -4,7 +4,7 @@
   <edmx:Runtime>
     <!-- SSDL content -->
     <edmx:StorageModels>
-    <Schema Namespace="RingtoetsEntityModel.Store" Provider="System.Data.SQLite.EF6" ProviderManifestToken="data source=Application\Ringtoets\src\Application.Ringtoets.Storage\Ringtoets.rt" Alias="Self" xmlns:store="http://schemas.microsoft.com/ado/2007/12/edm/EntityStoreSchemaGenerator" xmlns:customannotation="http://schemas.microsoft.com/ado/2013/11/edm/customannotation" xmlns="http://schemas.microsoft.com/ado/2009/11/edm/ssdl">
+    <Schema Namespace="RingtoetsEntityModel.Store" Provider="System.Data.SQLite.EF6" ProviderManifestToken="data source=D:\Projects\WTI\trunk\Application\Ringtoets\src\Application.Ringtoets.Storage\Ringtoets.rt" Alias="Self" xmlns:store="http://schemas.microsoft.com/ado/2007/12/edm/EntityStoreSchemaGenerator" xmlns:customannotation="http://schemas.microsoft.com/ado/2013/11/edm/customannotation" xmlns="http://schemas.microsoft.com/ado/2009/11/edm/ssdl">
         <EntityType Name="ProjectEntity">
           <Key>
             <PropertyRef Name="ProjectEntityId" />
@@ -14,15 +14,26 @@
           <Property Name="Description" Type="varchar" MaxLength="1024" />
           <Property Name="LastUpdated" Type="integer" Nullable="false" />
         </EntityType>
+        <EntityType Name="Version">
+          <Key>
+            <PropertyRef Name="VersionId" />
+          </Key>
+          <Property Name="VersionId" Type="integer" StoreGeneratedPattern="Identity" Nullable="false" />
+          <Property Name="FromVersion" Type="varchar" MaxLength="50" />
+          <Property Name="ToVersion" Type="varchar" MaxLength="50" />
+          <Property Name="Timestamp" Type="decimal" Precision="53" Scale="0" />
+        </EntityType>
         <EntityContainer Name="RingtoetsEntityModelStoreContainer">
           <EntitySet Name="ProjectEntity" EntityType="Self.ProjectEntity" store:Type="Tables" />
+          <EntitySet Name="Version" EntityType="Self.Version" store:Type="Tables" />
         </EntityContainer>
       </Schema></edmx:StorageModels>
     <!-- CSDL content -->
     <edmx:ConceptualModels>
       <Schema Namespace="RingtoetsEntityModel" Alias="Self" annotation:UseStrongSpatialTypes="false" xmlns:annotation="http://schemas.microsoft.com/ado/2009/02/edm/annotation" xmlns:customannotation="http://schemas.microsoft.com/ado/2013/11/edm/customannotation" xmlns="http://schemas.microsoft.com/ado/2009/11/edm">
         <EntityContainer Name="RingtoetsEntities" annotation:LazyLoadingEnabled="false">
           <EntitySet Name="ProjectEntities" EntityType="RingtoetsEntityModel.ProjectEntity" />
+          <EntitySet Name="Versions" EntityType="RingtoetsEntityModel.Version" />
         </EntityContainer>
         <EntityType Name="ProjectEntity">
           <Key>
@@ -33,6 +44,15 @@
           <Property Name="Description" Type="String" MaxLength="1024" FixedLength="false" Unicode="false" />
           <Property Name="LastUpdated" Type="Int64" Nullable="false" />
         </EntityType>
+        <EntityType Name="Version">
+          <Key>
+            <PropertyRef Name="VersionId" />
+          </Key>
+          <Property Name="VersionId" Type="Int64" Nullable="false" annotation:StoreGeneratedPattern="Identity" />
+          <Property Name="FromVersion" Type="String" MaxLength="50" FixedLength="false" Unicode="false" />
+          <Property Name="ToVersion" Type="String" MaxLength="50" FixedLength="false" Unicode="false" />
+          <Property Name="Timestamp" Type="Decimal" Precision="53" Scale="0" />
+        </EntityType>
         </Schema>
     </edmx:ConceptualModels>
     <!-- C-S mapping content -->
@@ -49,6 +69,16 @@
               </MappingFragment>
             </EntityTypeMapping>
           </EntitySetMapping>
+          <EntitySetMapping Name="Versions">
+            <EntityTypeMapping TypeName="RingtoetsEntityModel.Version">
+              <MappingFragment StoreEntitySet="Version">
+                <ScalarProperty Name="Timestamp" ColumnName="Timestamp" />
+                <ScalarProperty Name="ToVersion" ColumnName="ToVersion" />
+                <ScalarProperty Name="FromVersion" ColumnName="FromVersion" />
+                <ScalarProperty Name="VersionId" ColumnName="VersionId" />
+              </MappingFragment>
+            </EntityTypeMapping>
+          </EntitySetMapping>
         </EntityContainerMapping>
       </Mapping>
     </edmx:Mappings>
@@ -64,7 +94,7 @@
       <DesignerInfoPropertySet>
         <DesignerProperty Name="ValidateOnBuild" Value="true" />
         <DesignerProperty Name="EnablePluralization" Value="true" />
-        <DesignerProperty Name="IncludeForeignKeysInModel" Value="true" />
+        <DesignerProperty Name="IncludeForeignKeysInModel" Value="True" />
         <DesignerProperty Name="UseLegacyProvider" Value="false" />
         <DesignerProperty Name="CodeGenerationStrategy" Value="None" />
       </DesignerInfoPropertySet>
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/RingtoetsDBContext.edmx.diagram
===================================================================
diff -u -r0155f2f233aefc7951782b302e1398e02c00f298 -r654d3a712eedbdeea718dc0448c5544f09e053cd
--- Application/Ringtoets/src/Application.Ringtoets.Storage/RingtoetsDBContext.edmx.diagram	(.../RingtoetsDBContext.edmx.diagram)	(revision 0155f2f233aefc7951782b302e1398e02c00f298)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/RingtoetsDBContext.edmx.diagram	(.../RingtoetsDBContext.edmx.diagram)	(revision 654d3a712eedbdeea718dc0448c5544f09e053cd)
@@ -6,6 +6,7 @@
     <edmx:Diagrams>
       <Diagram DiagramId="26a0f7861edd4ba59e8393e1f2494b81" Name="Diagram1" ZoomLevel="82">
         <EntityTypeShape EntityType="RingtoetsEntityModel.ProjectEntity" Width="2.125" PointX="0.75" PointY="0.75" />
+        <EntityTypeShape EntityType="RingtoetsEntityModel.Version" Width="1.5" PointX="3.375" PointY="0.75" />
       </Diagram>
     </edmx:Diagrams>
   </edmx:Designer>
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/StorageSqLite.cs
===================================================================
diff -u -r3a8bff057967bdb42389382472f6ce55789a0ced -r654d3a712eedbdeea718dc0448c5544f09e053cd
--- Application/Ringtoets/src/Application.Ringtoets.Storage/StorageSqLite.cs	(.../StorageSqLite.cs)	(revision 3a8bff057967bdb42389382472f6ce55789a0ced)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/StorageSqLite.cs	(.../StorageSqLite.cs)	(revision 654d3a712eedbdeea718dc0448c5544f09e053cd)
@@ -3,8 +3,11 @@
 using System.Data.Entity.Core;
 using System.IO;
 using Application.Ringtoets.Storage.Converter;
-using Application.Ringtoets.Storage.Properties;
+using Application.Ringtoets.Storage.Exceptions;
 using Core.Common.Base.Data;
+using Core.Common.Utils;
+using Core.Common.Utils.Builders;
+using UtilsResources = Core.Common.Utils.Properties.Resources;
 
 namespace Application.Ringtoets.Storage
 {
@@ -21,11 +24,20 @@
         /// <param name="databaseFilePath">Path to database file.</param>
         public StorageSqLite(string databaseFilePath)
         {
+            try
+            {
+                FileUtils.ValidateFilePath(databaseFilePath);
+            }
+            catch (ArgumentException e)
+            {
+                throw new InvalidFileException(e.Message, e);
+            }
             if (!File.Exists(databaseFilePath))
             {
-                var message = Resources.Error_File_does_not_exist;
+                var message = new FileReaderErrorMessageBuilder(databaseFilePath).Build(UtilsResources.Error_File_does_not_exist);
                 throw new FileNotFoundException(message);
             }
+
             connectionString = SqLiteStorageConnection.BuildConnectionString(databaseFilePath);
         }
 
@@ -46,7 +58,7 @@
                 {
                     dbContext.Database.Initialize(true);
                     dbContext.Database.Connection.Open();
-                    dbContext.ProjectEntities.Load();
+                    dbContext.Versions.Load();
                     return true;
                 }
                 catch (InvalidOperationException)
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Version.cs
===================================================================
diff -u
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Version.cs	(revision 0)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Version.cs	(revision 654d3a712eedbdeea718dc0448c5544f09e053cd)
@@ -0,0 +1,22 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated from a template.
+//
+//     Manual changes to this file may cause unexpected behavior in your application.
+//     Manual changes to this file will be overwritten if the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace Application.Ringtoets.Storage
+{
+    using System;
+    using System.Collections.Generic;
+    
+    public partial class Version
+    {
+        public long VersionId { get; set; }
+        public string FromVersion { get; set; }
+        public string ToVersion { get; set; }
+        public Nullable<decimal> Timestamp { get; set; }
+    }
+}
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/StorageSQLiteTest.cs
===================================================================
diff -u -r3a8bff057967bdb42389382472f6ce55789a0ced -r654d3a712eedbdeea718dc0448c5544f09e053cd
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/StorageSQLiteTest.cs	(.../StorageSQLiteTest.cs)	(revision 3a8bff057967bdb42389382472f6ce55789a0ced)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/StorageSQLiteTest.cs	(.../StorageSQLiteTest.cs)	(revision 654d3a712eedbdeea718dc0448c5544f09e053cd)
@@ -1,7 +1,11 @@
-using System.IO;
-using Application.Ringtoets.Storage.Properties;
+using System;
+using System.IO;
+using Application.Ringtoets.Storage.Exceptions;
+using Core.Common.Base.Data;
 using Core.Common.TestUtil;
+using Core.Common.Utils.Builders;
 using NUnit.Framework;
+using UtilsResources = Core.Common.Utils.Properties.Resources;
 
 namespace Application.Ringtoets.Storage.Test
 {
@@ -28,6 +32,19 @@
         [Test]
         [TestCase(null)]
         [TestCase("")]
+        public void Constructor_FileNullOrEmpty_throwsFileNotFoundException(string invalidPath)
+        {
+            // Call
+            TestDelegate test = () => new StorageSqLite(invalidPath);
+
+            // Assert
+            var exception = Assert.Throws<InvalidFileException>(test);
+            var expectedMessage = String.Format("Fout bij het lezen van bestand '{0}': {1}",
+                                                invalidPath, UtilsResources.Error_Path_must_be_specified);
+            Assert.AreEqual(expectedMessage, exception.Message);
+        }
+        
+        [Test]
         [TestCase("NonExistingFile")]
         public void Constructor_invalidPath_throwsFileNotFoundException(string invalidPath)
         {
@@ -36,7 +53,8 @@
 
             // Assert
             var exception = Assert.Throws<FileNotFoundException>(test);
-            Assert.AreEqual(Resources.Error_File_does_not_exist, exception.Message);
+            var expectedMessage = new FileReaderErrorMessageBuilder(invalidPath).Build(UtilsResources.Error_File_does_not_exist);
+            Assert.AreEqual(expectedMessage, exception.Message);
         }
 
         [Test]
@@ -55,6 +73,24 @@
         }
 
         [Test]
+        [TestCase("ValidRingtoetsDatabase.rt")]
+        public void LoadProject_validDatabase_ReturnsProject(string validPath)
+        {
+            // Setup
+            var dbFile = Path.Combine(testDataPath, validPath);
+
+            // Precondition
+            Assert.IsTrue(File.Exists(dbFile), "Precondition: file must exist.");
+
+            // Call
+            var storage = new StorageSqLite(dbFile);
+            Assert.True(storage.TestConnection(), "Precondition: file must be a valid Ringtoets database.");
+
+            var loadedProject = storage.LoadProject();
+            Assert.IsInstanceOf<Project>(loadedProject);
+        }
+
+        [Test]
         [TestCase("empty.rt")]
         public void TestConnection_invalidConnection_ReturnsFalse(string invalidPath)
         {
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/test-data/DatabaseFiles/ValidRingtoetsDatabase.rt
===================================================================
diff -u -r3a8bff057967bdb42389382472f6ce55789a0ced -r654d3a712eedbdeea718dc0448c5544f09e053cd
Binary files differ
Index: Core/Common/src/Core.Common.Utils/Builders/FileReaderErrorMessageBuilder.cs
===================================================================
diff -u
--- Core/Common/src/Core.Common.Utils/Builders/FileReaderErrorMessageBuilder.cs	(revision 0)
+++ Core/Common/src/Core.Common.Utils/Builders/FileReaderErrorMessageBuilder.cs	(revision 654d3a712eedbdeea718dc0448c5544f09e053cd)
@@ -0,0 +1,59 @@
+namespace Core.Common.Utils.Builders
+{
+    /// <summary>
+    /// Class to help create consistent file reader error messages.
+    /// </summary>
+    public class FileReaderErrorMessageBuilder
+    {
+        private readonly string filePath;
+        private string location;
+        private string subject;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="FileReaderErrorMessageBuilder"/> class.
+        /// </summary>
+        /// <param name="filePath">The file path to the file where the error occurred.</param>
+        public FileReaderErrorMessageBuilder(string filePath)
+        {
+            this.filePath = filePath;
+        }
+
+        /// <summary>
+        /// Builds the specified error message.
+        /// </summary>
+        /// <param name="errorMessage">The message about the error that has occurred.</param>
+        /// <returns>The full error message.</returns>
+        public string Build(string errorMessage)
+        {
+            return string.Format("Fout bij het lezen van bestand '{0}'{1}{2}: {3}",
+                                 filePath, 
+                                 location ?? string.Empty, 
+                                 subject ?? string.Empty,
+                                 errorMessage);
+        }
+
+        /// <summary>
+        /// Adds file location information to the error message.
+        /// </summary>
+        /// <param name="locationDescription">The location description.</param>
+        /// <returns>The builder being configured.</returns>
+        /// <example>line 7</example>
+        public FileReaderErrorMessageBuilder WithLocation(string locationDescription)
+        {
+            location = " " + locationDescription;
+            return this;
+        }
+
+        /// <summary>
+        /// Adds the subject where the error occurred to the error message.
+        /// </summary>
+        /// <param name="subjectDescription">The subject description.</param>
+        /// <returns>The builder being configured.</returns>
+        /// <example>soil profile 'blabla'</example>
+        public FileReaderErrorMessageBuilder WithSubject(string subjectDescription)
+        {
+            subject = string.Format(" ({0})", subjectDescription);
+            return this;
+        }
+    }
+}
\ No newline at end of file
Index: Core/Common/src/Core.Common.Utils/Core.Common.Utils.csproj
===================================================================
diff -u -rb92517dbc9956b930a6cfc7f96a1f762dfa41cf6 -r654d3a712eedbdeea718dc0448c5544f09e053cd
--- Core/Common/src/Core.Common.Utils/Core.Common.Utils.csproj	(.../Core.Common.Utils.csproj)	(revision b92517dbc9956b930a6cfc7f96a1f762dfa41cf6)
+++ Core/Common/src/Core.Common.Utils/Core.Common.Utils.csproj	(.../Core.Common.Utils.csproj)	(revision 654d3a712eedbdeea718dc0448c5544f09e053cd)
@@ -91,6 +91,7 @@
     <Compile Include="Attributes\ResourcesCategoryAttribute.cs" />
     <Compile Include="Attributes\ResourcesDescriptionAttribute.cs" />
     <Compile Include="Attributes\ResourcesDisplayNameAttribute.cs" />
+    <Compile Include="Builders\FileReaderErrorMessageBuilder.cs" />
     <Compile Include="Drawing\GraphicsExtensions.cs" />
     <Compile Include="Events\EventArgs.cs" />
     <Compile Include="Events\INotifyCollectionChanged.cs" />
@@ -100,10 +101,11 @@
     <Compile Include="Extensions\CollectionExtensions.cs" />
     <Compile Include="Extensions\ComparableExtensions.cs" />
     <Compile Include="Extensions\EnumerableExtensions.cs" />
-    <Compile Include="Properties\Resource.Designer.cs">
+    <Compile Include="FileUtils.cs" />
+    <Compile Include="Properties\Resources.Designer.cs">
       <AutoGen>True</AutoGen>
       <DesignTime>True</DesignTime>
-      <DependentUpon>Resource.resx</DependentUpon>
+      <DependentUpon>Resources.resx</DependentUpon>
     </Compile>
     <Compile Include="SettingsHelper.cs" />
     <Compile Include="Drawing\ImageExtensions.cs" />
@@ -153,10 +155,9 @@
     </BootstrapperPackage>
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="Properties\Resource.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resource.Designer.cs</LastGenOutput>
-      <SubType>Designer</SubType>
+    <EmbeddedResource Include="Properties\Resources.resx">
+      <Generator>PublicResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
Index: Core/Common/src/Core.Common.Utils/FileUtils.cs
===================================================================
diff -u
--- Core/Common/src/Core.Common.Utils/FileUtils.cs	(revision 0)
+++ Core/Common/src/Core.Common.Utils/FileUtils.cs	(revision 654d3a712eedbdeea718dc0448c5544f09e053cd)
@@ -0,0 +1,45 @@
+using System;
+using System.IO;
+using Core.Common.Utils.Properties;
+using Core.Common.Utils.Builders;
+
+namespace Core.Common.Utils
+{
+    /// <summary>
+    /// Class with reusable File related utility methods.
+    /// </summary>
+    public static class FileUtils 
+    {
+        /// <summary>
+        /// Validates the file path.
+        /// </summary>
+        /// <param name="path">The file path to be validated.</param>
+        /// <exception cref="System.ArgumentException"><paramref name="path"/> is invalid.</exception>
+        public  static void ValidateFilePath(string path)
+        {
+            if (String.IsNullOrWhiteSpace(path))
+            {
+                var message = new FileReaderErrorMessageBuilder(path).Build(Resources.Error_Path_must_be_specified);
+                throw new ArgumentException(message);
+            }
+
+            string name;
+            try
+            {
+                name = Path.GetFileName(path);
+            }
+            catch (ArgumentException e)
+            {
+                var message = new FileReaderErrorMessageBuilder(path)
+                    .Build(String.Format(Resources.Error_Path_cannot_contain_Characters_0_,
+                                         String.Join(", ", Path.GetInvalidFileNameChars())));
+                throw new ArgumentException(message, e);
+            }
+            if (String.Empty == name)
+            {
+                var message = new FileReaderErrorMessageBuilder(path).Build(Resources.Error_Path_must_not_point_to_folder);
+                throw new ArgumentException(message);
+            }
+        }
+    }
+}
\ No newline at end of file
Fisheye: Tag 654d3a712eedbdeea718dc0448c5544f09e053cd refers to a dead (removed) revision in file `Core/Common/src/Core.Common.Utils/Properties/Resource.Designer.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 654d3a712eedbdeea718dc0448c5544f09e053cd refers to a dead (removed) revision in file `Core/Common/src/Core.Common.Utils/Properties/Resource.resx'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Core/Common/src/Core.Common.Utils/Properties/Resources.Designer.cs
===================================================================
diff -u
--- Core/Common/src/Core.Common.Utils/Properties/Resources.Designer.cs	(revision 0)
+++ Core/Common/src/Core.Common.Utils/Properties/Resources.Designer.cs	(revision 654d3a712eedbdeea718dc0448c5544f09e053cd)
@@ -0,0 +1,254 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace Core.Common.Utils.Properties {
+    using System;
+    
+    
+    /// <summary>
+    ///   A strongly-typed resource class, for looking up localized strings, etc.
+    /// </summary>
+    // This class was auto-generated by the StronglyTypedResourceBuilder
+    // class via a tool like ResGen or Visual Studio.
+    // To add or remove a member, edit your .ResX file then rerun ResGen
+    // with the /str option, or rebuild your VS project.
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    public class Resources {
+        
+        private static global::System.Resources.ResourceManager resourceMan;
+        
+        private static global::System.Globalization.CultureInfo resourceCulture;
+        
+        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        internal Resources() {
+        }
+        
+        /// <summary>
+        ///   Returns the cached ResourceManager instance used by this class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        public static global::System.Resources.ResourceManager ResourceManager {
+            get {
+                if (object.ReferenceEquals(resourceMan, null)) {
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Core.Common.Utils.Properties.Resources", typeof(Resources).Assembly);
+                    resourceMan = temp;
+                }
+                return resourceMan;
+            }
+        }
+        
+        /// <summary>
+        ///   Overrides the current thread's CurrentUICulture property for all
+        ///   resource lookups using this strongly typed resource class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        public static global::System.Globalization.CultureInfo Culture {
+            get {
+                return resourceCulture;
+            }
+            set {
+                resourceCulture = value;
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Kon &apos;Assembly&apos; informatie niet lezen voor {0} : {1}.
+        /// </summary>
+        public static string AssemblyUtils_LoadAllAssembliesFromDirectory_Could_not_read_assembly_information_for_0_1_ {
+            get {
+                return ResourceManager.GetString("AssemblyUtils_LoadAllAssembliesFromDirectory_Could_not_read_assembly_information_" +
+                        "for_0_1_", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Parameter &apos;GroupSize&apos; moet groter zijn dan 0..
+        /// </summary>
+        public static string EnumerableExtensions_SplitInGroups_GroupSize_must_be_greater_than_0 {
+            get {
+                return ResourceManager.GetString("EnumerableExtensions_SplitInGroups_GroupSize_must_be_greater_than_0", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Het bestandspad verwijst naar een map die niet bestaat..
+        /// </summary>
+        public static string Error_Directory_missing {
+            get {
+                return ResourceManager.GetString("Error_Directory_missing", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Het bestand bestaat niet..
+        /// </summary>
+        public static string Error_File_does_not_exist {
+            get {
+                return ResourceManager.GetString("Error_File_does_not_exist", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Het bestand is leeg..
+        /// </summary>
+        public static string Error_File_empty {
+            get {
+                return ResourceManager.GetString("Error_File_empty", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Er is een onverwachte fout opgetreden tijdens het inlezen van het bestand: {0}.
+        /// </summary>
+        public static string Error_General_IO_ErrorMessage_0_ {
+            get {
+                return ResourceManager.GetString("Error_General_IO_ErrorMessage_0_", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Regel bevat te veel tekst om in het RAM geheugen opgeslagen te worden..
+        /// </summary>
+        public static string Error_Line_too_big_for_RAM {
+            get {
+                return ResourceManager.GetString("Error_Line_too_big_for_RAM", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Bestandspad mag niet de volgende tekens bevatten: {0}.
+        /// </summary>
+        public static string Error_Path_cannot_contain_Characters_0_ {
+            get {
+                return ResourceManager.GetString("Error_Path_cannot_contain_Characters_0_", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Bestandspad mag niet leeg of ongedefinieerd zijn..
+        /// </summary>
+        public static string Error_Path_must_be_specified {
+            get {
+                return ResourceManager.GetString("Error_Path_must_be_specified", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Bestandspad mag niet naar een map verwijzen..
+        /// </summary>
+        public static string Error_Path_must_not_point_to_folder {
+            get {
+                return ResourceManager.GetString("Error_Path_must_not_point_to_folder", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Kopiëren van {0}\{1}.
+        /// </summary>
+        public static string FileUtils_CopyAll_Copying_0_1_ {
+            get {
+                return ResourceManager.GetString("FileUtils_CopyAll_Copying_0_1_", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to afgebroken.
+        /// </summary>
+        public static string InvokeRequiredAttribute_LogInvokeError_aborted {
+            get {
+                return ResourceManager.GetString("InvokeRequiredAttribute_LogInvokeError_aborted", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to wordt overgeslagen.
+        /// </summary>
+        public static string InvokeRequiredAttribute_LogInvokeError_skipping {
+            get {
+                return ResourceManager.GetString("InvokeRequiredAttribute_LogInvokeError_skipping", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Thread synchronisatiefout (aanroep {1}): {0}.
+        /// </summary>
+        public static string InvokeRequiredAttribute_LogInvokeError_Thread_synchronization_error_call_1_0_ {
+            get {
+                return ResourceManager.GetString("InvokeRequiredAttribute_LogInvokeError_Thread_synchronization_error_call_1_0_", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Geprobeerd het kenmerk in de beschikbare spatiale data te vervangen, maar kon kenmerk niet vinden in de oorspronkelijke context: {0}..
+        /// </summary>
+        public static string ObjectHelper_CouldNotFindFeatureInOriginalContext {
+            get {
+                return ResourceManager.GetString("ObjectHelper_CouldNotFindFeatureInOriginalContext", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Kan methode {0}.TryParse(string, out {0}) niet vinden..
+        /// </summary>
+        public static string ParseHelper_ParseHelper_Cannot_find_method_0_TryParse_string_out_0_ {
+            get {
+                return ResourceManager.GetString("ParseHelper_ParseHelper_Cannot_find_method_0_TryParse_string_out_0_", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Kritieke fout opgetreden..
+        /// </summary>
+        public static string TypeUtils_CallMethod_Exception_occured {
+            get {
+                return ResourceManager.GetString("TypeUtils_CallMethod_Exception_occured", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Geen &apos;default constructor&apos; gevonden voor type {0}..
+        /// </summary>
+        public static string TypeUtils_CreateInstance_No_default_constructor_available_for_type_0_ {
+            get {
+                return ResourceManager.GetString("TypeUtils_CreateInstance_No_default_constructor_available_for_type_0_", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to &apos;{0}&apos; is geen geldige expressie voor deze methode..
+        /// </summary>
+        public static string TypeUtils_GetMemberName_0_is_not_a_valid_expression_for_this_method {
+            get {
+                return ResourceManager.GetString("TypeUtils_GetMemberName_0_is_not_a_valid_expression_for_this_method", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Parameter &apos;member&apos; is geen geldige expressie voor deze methode..
+        /// </summary>
+        public static string TypeUtils_GetMemberNameFromMemberExpression_member_not_a_valid_expression_for_this_method {
+            get {
+                return ResourceManager.GetString("TypeUtils_GetMemberNameFromMemberExpression_member_not_a_valid_expression_for_thi" +
+                        "s_method", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to {0}, ernst: {1} ({2} fout(en), {3} waarschuwing(en), {4} info)..
+        /// </summary>
+        public static string ValidationReport_ToString_0_severity_1_2_error_s_3_warnings_4_info {
+            get {
+                return ResourceManager.GetString("ValidationReport_ToString_0_severity_1_2_error_s_3_warnings_4_info", resourceCulture);
+            }
+        }
+    }
+}
Index: Core/Common/src/Core.Common.Utils/Properties/Resources.resx
===================================================================
diff -u
--- Core/Common/src/Core.Common.Utils/Properties/Resources.resx	(revision 0)
+++ Core/Common/src/Core.Common.Utils/Properties/Resources.resx	(revision 654d3a712eedbdeea718dc0448c5544f09e053cd)
@@ -0,0 +1,183 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="AssemblyUtils_LoadAllAssembliesFromDirectory_Could_not_read_assembly_information_for_0_1_" xml:space="preserve">
+    <value>Kon 'Assembly' informatie niet lezen voor {0} : {1}</value>
+  </data>
+  <data name="EnumerableExtensions_SplitInGroups_GroupSize_must_be_greater_than_0" xml:space="preserve">
+    <value>Parameter 'GroupSize' moet groter zijn dan 0.</value>
+  </data>
+  <data name="Error_Directory_missing" xml:space="preserve">
+    <value>Het bestandspad verwijst naar een map die niet bestaat.</value>
+  </data>
+  <data name="Error_File_does_not_exist" xml:space="preserve">
+    <value>Het bestand bestaat niet.</value>
+  </data>
+  <data name="Error_File_empty" xml:space="preserve">
+    <value>Het bestand is leeg.</value>
+  </data>
+  <data name="Error_General_IO_ErrorMessage_0_" xml:space="preserve">
+    <value>Er is een onverwachte fout opgetreden tijdens het inlezen van het bestand: {0}</value>
+  </data>
+  <data name="Error_Line_too_big_for_RAM" xml:space="preserve">
+    <value>Regel bevat te veel tekst om in het RAM geheugen opgeslagen te worden.</value>
+  </data>
+  <data name="Error_Path_cannot_contain_Characters_0_" xml:space="preserve">
+    <value>Bestandspad mag niet de volgende tekens bevatten: {0}</value>
+  </data>
+  <data name="Error_Path_must_be_specified" xml:space="preserve">
+    <value>Bestandspad mag niet leeg of ongedefinieerd zijn.</value>
+  </data>
+  <data name="Error_Path_must_not_point_to_folder" xml:space="preserve">
+    <value>Bestandspad mag niet naar een map verwijzen.</value>
+  </data>
+  <data name="FileUtils_CopyAll_Copying_0_1_" xml:space="preserve">
+    <value>Kopiëren van {0}\{1}</value>
+  </data>
+  <data name="InvokeRequiredAttribute_LogInvokeError_aborted" xml:space="preserve">
+    <value>afgebroken</value>
+  </data>
+  <data name="InvokeRequiredAttribute_LogInvokeError_skipping" xml:space="preserve">
+    <value>wordt overgeslagen</value>
+  </data>
+  <data name="InvokeRequiredAttribute_LogInvokeError_Thread_synchronization_error_call_1_0_" xml:space="preserve">
+    <value>Thread synchronisatiefout (aanroep {1}): {0}</value>
+  </data>
+  <data name="ObjectHelper_CouldNotFindFeatureInOriginalContext" xml:space="preserve">
+    <value>Geprobeerd het kenmerk in de beschikbare spatiale data te vervangen, maar kon kenmerk niet vinden in de oorspronkelijke context: {0}.</value>
+  </data>
+  <data name="ParseHelper_ParseHelper_Cannot_find_method_0_TryParse_string_out_0_" xml:space="preserve">
+    <value>Kan methode {0}.TryParse(string, out {0}) niet vinden.</value>
+  </data>
+  <data name="TypeUtils_CallMethod_Exception_occured" xml:space="preserve">
+    <value>Kritieke fout opgetreden.</value>
+  </data>
+  <data name="TypeUtils_CreateInstance_No_default_constructor_available_for_type_0_" xml:space="preserve">
+    <value>Geen 'default constructor' gevonden voor type {0}.</value>
+  </data>
+  <data name="TypeUtils_GetMemberNameFromMemberExpression_member_not_a_valid_expression_for_this_method" xml:space="preserve">
+    <value>Parameter 'member' is geen geldige expressie voor deze methode.</value>
+  </data>
+  <data name="TypeUtils_GetMemberName_0_is_not_a_valid_expression_for_this_method" xml:space="preserve">
+    <value>'{0}' is geen geldige expressie voor deze methode.</value>
+  </data>
+  <data name="ValidationReport_ToString_0_severity_1_2_error_s_3_warnings_4_info" xml:space="preserve">
+    <value>{0}, ernst: {1} ({2} fout(en), {3} waarschuwing(en), {4} info).</value>
+  </data>
+</root>
\ No newline at end of file
Index: Core/Common/src/Core.Common.Utils/Reflection/AssemblyUtils.cs
===================================================================
diff -u -r942c15559d170726bdfe0dada2077be40a010b87 -r654d3a712eedbdeea718dc0448c5544f09e053cd
--- Core/Common/src/Core.Common.Utils/Reflection/AssemblyUtils.cs	(.../AssemblyUtils.cs)	(revision 942c15559d170726bdfe0dada2077be40a010b87)
+++ Core/Common/src/Core.Common.Utils/Reflection/AssemblyUtils.cs	(.../AssemblyUtils.cs)	(revision 654d3a712eedbdeea718dc0448c5544f09e053cd)
@@ -264,7 +264,7 @@
                 }
                 catch (Exception exception)
                 {
-                    log.ErrorFormat(Resource.AssemblyUtils_LoadAllAssembliesFromDirectory_Could_not_read_assembly_information_for_0_1_, assemblyName, exception.Message);
+                    log.ErrorFormat(Resources.AssemblyUtils_LoadAllAssembliesFromDirectory_Could_not_read_assembly_information_for_0_1_, assemblyName, exception.Message);
                     continue;
                 }
 
Index: Core/Common/src/Core.Common.Utils/Reflection/TypeUtils.cs
===================================================================
diff -u -r6c693d509fdef4935fdede8b547f1f815f70ebb2 -r654d3a712eedbdeea718dc0448c5544f09e053cd
--- Core/Common/src/Core.Common.Utils/Reflection/TypeUtils.cs	(.../TypeUtils.cs)	(revision 6c693d509fdef4935fdede8b547f1f815f70ebb2)
+++ Core/Common/src/Core.Common.Utils/Reflection/TypeUtils.cs	(.../TypeUtils.cs)	(revision 654d3a712eedbdeea718dc0448c5544f09e053cd)
@@ -223,7 +223,7 @@
                 return GetMemberNameFromMemberExpression(unary.Operand as MemberExpression);
             }
 
-            var message = string.Format(Resource.TypeUtils_GetMemberName_0_is_not_a_valid_expression_for_this_method, e);
+            var message = string.Format(Resources.TypeUtils_GetMemberName_0_is_not_a_valid_expression_for_this_method, e);
             throw new ArgumentException(message);
         }
 
@@ -433,7 +433,7 @@
 
             if (defaultConstructor == null)
             {
-                throw new NotImplementedException(string.Format(Resource.TypeUtils_CreateInstance_No_default_constructor_available_for_type_0_, type));
+                throw new NotImplementedException(string.Format(Resources.TypeUtils_CreateInstance_No_default_constructor_available_for_type_0_, type));
             }
 
             return (T) Activator.CreateInstance(type, true);
@@ -486,7 +486,7 @@
                 // re-throw original exception
                 if (e.InnerException != null)
                 {
-                    log.Error(Resource.TypeUtils_CallMethod_Exception_occured, e); // log outer exception
+                    log.Error(Resources.TypeUtils_CallMethod_Exception_occured, e); // log outer exception
 
                     throw e.InnerException;
                 }
@@ -515,7 +515,7 @@
             {
                 return member.Member.Name;
             }
-            throw new ArgumentException(Resource.TypeUtils_GetMemberNameFromMemberExpression_member_not_a_valid_expression_for_this_method);
+            throw new ArgumentException(Resources.TypeUtils_GetMemberNameFromMemberExpression_member_not_a_valid_expression_for_this_method);
         }
 
         private static FieldInfo GetFieldInfo(Type type, string fieldName)
Index: Core/Common/src/Core.Common.Utils/Validation/ValidationReport.cs
===================================================================
diff -u -r622c20f6fc0b693b67a3e57b2ece939823002c62 -r654d3a712eedbdeea718dc0448c5544f09e053cd
--- Core/Common/src/Core.Common.Utils/Validation/ValidationReport.cs	(.../ValidationReport.cs)	(revision 622c20f6fc0b693b67a3e57b2ece939823002c62)
+++ Core/Common/src/Core.Common.Utils/Validation/ValidationReport.cs	(.../ValidationReport.cs)	(revision 654d3a712eedbdeea718dc0448c5544f09e053cd)
@@ -161,7 +161,7 @@
 
         public override string ToString()
         {
-            return string.Format(Resource.ValidationReport_ToString_0_severity_1_2_error_s_3_warnings_4_info,
+            return string.Format(Resources.ValidationReport_ToString_0_severity_1_2_error_s_3_warnings_4_info,
                                  Category, Severity,
                                  ErrorCount, WarningCount, InfoCount);
         }
Index: Core/Common/test/Core.Common.TestUtil/TestDataPath.cs
===================================================================
diff -u -r3a8bff057967bdb42389382472f6ce55789a0ced -r654d3a712eedbdeea718dc0448c5544f09e053cd
--- Core/Common/test/Core.Common.TestUtil/TestDataPath.cs	(.../TestDataPath.cs)	(revision 3a8bff057967bdb42389382472f6ce55789a0ced)
+++ Core/Common/test/Core.Common.TestUtil/TestDataPath.cs	(.../TestDataPath.cs)	(revision 654d3a712eedbdeea718dc0448c5544f09e053cd)
@@ -21,19 +21,14 @@
             {
                 public static readonly TestDataPath Storage = System.IO.Path.Combine("Application", "Ringtoets", "test", "Application.Ringtoets.Storage.Test");
             }
-
-            public static readonly TestDataPath CorePluginsSharpMapGisTests =
-                @"Core/Plugins/test/Core.Plugins.SharpMapGis.Test/";
         }
 
-        public static class Common
+        public static class Core
         {
-            public static readonly TestDataPath CoreCommonUtilsTests =
-                System.IO.Path.Combine("Core", "Common", "test", "Core.Common.Utils.Test");
-
-            public static class Base
+            public static class Common
             {
-                public static readonly TestDataPath CoreCommonBaseTests = @"Core/Common/test/Core.Common.Base.Test";
+                public static readonly TestDataPath Base = System.IO.Path.Combine("Core", "Common", "test", "Core.Common.Base.Test");
+                public static readonly TestDataPath Utils = System.IO.Path.Combine("Core", "Common", "test", "Core.Common.Utils.Test");
             }
         }
 
@@ -43,9 +38,6 @@
             {
                 public static readonly TestDataPath IO = System.IO.Path.Combine("Ringtoets", "Piping", "test", "Ringtoets.Piping.IO.Test");
             }
-
-            public static readonly TestDataPath CorePluginsSharpMapGisTests =
-                @"Core/Plugins/test/Core.Plugins.SharpMapGis.Test/";
         }
     }
 }
\ No newline at end of file
Index: Core/Common/test/Core.Common.TestUtil/TestHelper.cs
===================================================================
diff -u -r632b9c8cd36e7663a17e53320d3bfedb873889e0 -r654d3a712eedbdeea718dc0448c5544f09e053cd
--- Core/Common/test/Core.Common.TestUtil/TestHelper.cs	(.../TestHelper.cs)	(revision 632b9c8cd36e7663a17e53320d3bfedb873889e0)
+++ Core/Common/test/Core.Common.TestUtil/TestHelper.cs	(.../TestHelper.cs)	(revision 654d3a712eedbdeea718dc0448c5544f09e053cd)
@@ -7,11 +7,9 @@
 using System.Linq;
 using System.Reflection;
 using System.Windows.Forms;
-
 using log4net.Appender;
 using log4net.Config;
 using log4net.Core;
-
 using NUnit.Framework;
 
 namespace Core.Common.TestUtil
@@ -196,12 +194,12 @@
             }
 
             var userMessage = String.IsNullOrEmpty(message) ? "" : message + ". ";
-            if ( ! rank.Equals(1.0f))
+            if (!rank.Equals(1.0f))
             {
-                Assert.IsTrue(rank * actualMillisecond < maxMilliseconds, userMessage + "Maximum of {0} milliseconds exceeded. Actual was {1}, machine performance weighted actual was {2}",
-                              maxMilliseconds, actualMillisecond, actualMillisecond * rank);
+                Assert.IsTrue(rank*actualMillisecond < maxMilliseconds, userMessage + "Maximum of {0} milliseconds exceeded. Actual was {1}, machine performance weighted actual was {2}",
+                              maxMilliseconds, actualMillisecond, actualMillisecond*rank);
                 Console.WriteLine(userMessage + String.Format("Test took {1} milliseconds (machine performance weighted {2}). Maximum was {0}",
-                                                              maxMilliseconds, actualMillisecond, actualMillisecond * rank));
+                                                              maxMilliseconds, actualMillisecond, actualMillisecond*rank));
             }
             else
             {
@@ -243,7 +241,7 @@
             AssertExpectedMessagesInRenderedMessages(messages, renderedMessages);
             if (expectedLogMessageCount != null)
             {
-                Assert.AreEqual((int)expectedLogMessageCount, renderedMessages.Count());
+                Assert.AreEqual((int) expectedLogMessageCount, renderedMessages.Count());
             }
         }
 
@@ -331,6 +329,30 @@
             AssertContextMenuStripContainsItem(menu.DropDownItems, position, text, toolTip, icon, enabled);
         }
 
+        /// <summary>
+        /// Asserts that the exception is of type <typeparamref name="T"/> and that the custom part of <see cref="Exception.Message"/> 
+        /// is equal to <paramref name="expectedCustomMessage"/>.
+        /// </summary>
+        /// <typeparam name="T">The type of the expected exception.</typeparam>
+        /// <param name="test">The test to execute and should throw exception of type <typeparamref name="T"/>.</param>
+        /// <param name="expectedCustomMessage">The expected custom part of the exception message.</param>
+        public static void AssertThrowsArgumentExceptionAndTestMessage<T>(TestDelegate test, string expectedCustomMessage) where T : ArgumentException
+        {
+            var exception = Assert.Throws<T>(test);
+            var message = exception.Message;
+            if (exception.ParamName != null)
+            {
+                var customMessageParts = message.Split(new[]
+                {
+                    Environment.NewLine
+                }, StringSplitOptions.None).ToList();
+                customMessageParts.RemoveAt(customMessageParts.Count - 1);
+
+                message = String.Join(Environment.NewLine, customMessageParts.ToArray());
+            }
+            Assert.AreEqual(expectedCustomMessage, message);
+        }
+
         private static void AssertContextMenuStripContainsItem(ToolStripItemCollection items, int position, string text, string toolTip, Image icon, bool enabled = true)
         {
             Assert.Less(position, items.Count);
@@ -368,30 +390,6 @@
             }
         }
 
-        /// <summary>
-        /// Asserts that the exception is of type <typeparamref name="T"/> and that the custom part of <see cref="Exception.Message"/> 
-        /// is equal to <paramref name="expectedCustomMessage"/>.
-        /// </summary>
-        /// <typeparam name="T">The type of the expected exception.</typeparam>
-        /// <param name="test">The test to execute and should throw exception of type <typeparamref name="T"/>.</param>
-        /// <param name="expectedCustomMessage">The expected custom part of the exception message.</param>
-        public static void AssertThrowsArgumentExceptionAndTestMessage<T>(TestDelegate test, string expectedCustomMessage) where T : ArgumentException
-        {
-            var exception = Assert.Throws<T>(test);
-            var message = exception.Message;
-            if (exception.ParamName != null)
-            {
-                var customMessageParts = message.Split(new[]
-                {
-                    Environment.NewLine
-                }, StringSplitOptions.None).ToList();
-                customMessageParts.RemoveAt(customMessageParts.Count - 1);
-
-                message = String.Join(Environment.NewLine, customMessageParts.ToArray());
-            }
-            Assert.AreEqual(expectedCustomMessage, message);
-        }
-
         private static string GetCurrentTestClassMethodName()
         {
             var stackTrace = new StackTrace(false);
@@ -498,15 +496,15 @@
         private static Color[] GetImageAsColorArray(Image image)
         {
             // Convert image to ARGB bitmap using 8bits/channel:
-            var bitmap = new Bitmap(image).Clone(new Rectangle(0,0, image.Size.Width, image.Size.Height), PixelFormat.Format32bppArgb);
+            var bitmap = new Bitmap(image).Clone(new Rectangle(0, 0, image.Size.Width, image.Size.Height), PixelFormat.Format32bppArgb);
 
             var index = 0;
-            var imageColors = new Color[image.Size.Width * image.Size.Height];
+            var imageColors = new Color[image.Size.Width*image.Size.Height];
             for (int i = 0; i < bitmap.Height; i++)
             {
                 for (int j = 0; j < bitmap.Width; j++)
                 {
-                    imageColors[index] = bitmap.GetPixel(i,j);
+                    imageColors[index] = bitmap.GetPixel(i, j);
                 }
             }
             return imageColors;
Index: Core/Common/test/Core.Common.Utils.Test/Builders/FileReaderErrorMessageBuilderTest.cs
===================================================================
diff -u
--- Core/Common/test/Core.Common.Utils.Test/Builders/FileReaderErrorMessageBuilderTest.cs	(revision 0)
+++ Core/Common/test/Core.Common.Utils.Test/Builders/FileReaderErrorMessageBuilderTest.cs	(revision 654d3a712eedbdeea718dc0448c5544f09e053cd)
@@ -0,0 +1,77 @@
+using Core.Common.Utils.Builders;
+using NUnit.Framework;
+
+namespace Core.Common.Utils.Test.Builders
+{
+    [TestFixture]
+    public class FileReaderErrorMessageBuilderTest
+    {
+        [Test]
+        public void Build_BasedOnPathAndMessage_ReturnBuiltErrorMessage()
+        {
+            // Setup
+            const string filePath = "<file path>";
+            const string errorMessage = "test test 1,2,3";
+
+            // Call
+            var message = new FileReaderErrorMessageBuilder(filePath).Build(errorMessage);
+
+            // Assert
+            var expectedMessage = string.Format("Fout bij het lezen van bestand '{0}': {1}",
+                                                filePath, errorMessage);
+            Assert.AreEqual(expectedMessage, message);
+        }
+
+        [Test]
+        public void Build_BasedOnPathAndMessageWithLocation_ReturnBuiltErrorMessage()
+        {
+            // Setup
+            const string filePath = "<file path>";
+            const string errorMessage = "test test 1,2,3";
+            const string location = "<location description>";
+
+            // Call
+            var message = new FileReaderErrorMessageBuilder(filePath).WithLocation(location).Build(errorMessage);
+
+            // Assert
+            var expectedMessage = string.Format("Fout bij het lezen van bestand '{0}' {1}: {2}",
+                                                filePath, location, errorMessage);
+            Assert.AreEqual(expectedMessage, message);
+        }
+
+        [Test]
+        public void Build_BasedOnPathAndMessageWithSubject_ReturnBuiltErrorMessage()
+        {
+            // Setup
+            const string filePath = "<file path>";
+            const string errorMessage = "test test 1,2,3";
+            const string subject = "<subject description>";
+
+            // Call
+            var message = new FileReaderErrorMessageBuilder(filePath).WithSubject(subject).Build(errorMessage);
+
+            // Assert
+            var expectedMessage = string.Format("Fout bij het lezen van bestand '{0}' ({1}): {2}",
+                                                filePath, subject, errorMessage);
+            Assert.AreEqual(expectedMessage, message);
+        }
+
+        [Test]
+        public void Build_BasedOnPathAndMessageWithSubjectAndLocation_ReturnBuiltErrorMessage()
+        {
+            // Setup
+            const string filePath = "<file path>";
+            const string errorMessage = "test test 1,2,3";
+            const string subject = "<subject description>";
+            const string location = "<location description>";
+
+            // Call
+            var message = new FileReaderErrorMessageBuilder(filePath).WithSubject(subject).WithLocation(location).Build(errorMessage);
+
+            // Assert
+            var expectedMessage = string.Format("Fout bij het lezen van bestand '{0}' {1} ({2}): {3}",
+                                                filePath, location, subject, errorMessage);
+            Assert.AreEqual(expectedMessage, message);
+        }
+    }
+}
\ No newline at end of file
Index: Core/Common/test/Core.Common.Utils.Test/Core.Common.Utils.Test.csproj
===================================================================
diff -u -rb92517dbc9956b930a6cfc7f96a1f762dfa41cf6 -r654d3a712eedbdeea718dc0448c5544f09e053cd
--- Core/Common/test/Core.Common.Utils.Test/Core.Common.Utils.Test.csproj	(.../Core.Common.Utils.Test.csproj)	(revision b92517dbc9956b930a6cfc7f96a1f762dfa41cf6)
+++ Core/Common/test/Core.Common.Utils.Test/Core.Common.Utils.Test.csproj	(.../Core.Common.Utils.Test.csproj)	(revision 654d3a712eedbdeea718dc0448c5544f09e053cd)
@@ -86,13 +86,15 @@
     <Compile Include="Attributes\ResourcesDisplayNameAttributeTest.cs" />
     <Compile Include="Attributes\ResourcesDescriptionAttributeTest.cs" />
     <Compile Include="Attributes\ResourcesCategoryAttributeTest.cs" />
+    <Compile Include="Builders\FileReaderErrorMessageBuilderTest.cs" />
     <Compile Include="Drawing\GraphicsExtensionsTest.cs" />
     <Compile Include="Drawing\ImageExtensionsTest.cs" />
     <Compile Include="Events\EventArgsTest.cs" />
     <Compile Include="Events\NotifyCollectionChangeEventArgsTest.cs" />
     <Compile Include="Extensions\CollectionExtensionsTest.cs" />
     <Compile Include="Extensions\ComparableExtensionsTest.cs" />
     <Compile Include="Extensions\EnumerableExtensionsTest.cs" />
+    <Compile Include="FileUtilsTest.cs" />
     <Compile Include="MathUtilsTest.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Properties\Resources.Designer.cs">
Index: Core/Common/test/Core.Common.Utils.Test/FileUtilsTest.cs
===================================================================
diff -u
--- Core/Common/test/Core.Common.Utils.Test/FileUtilsTest.cs	(revision 0)
+++ Core/Common/test/Core.Common.Utils.Test/FileUtilsTest.cs	(revision 654d3a712eedbdeea718dc0448c5544f09e053cd)
@@ -0,0 +1,72 @@
+using System;
+using System.IO;
+using Core.Common.TestUtil;
+using NUnit.Framework;
+
+namespace Core.Common.Utils.Test
+{
+    [TestFixture]
+    public class FileUtilsTest
+    {
+        [Test]
+        public void ValidateFilePath_ValidPath_DoesNotThrowAnyExceptions()
+        {
+            // Setup
+            var path = TestHelper.GetTestDataPath(TestDataPath.Core.Common.Utils, "validFile.txt");
+
+            // Call
+            TestDelegate call = () => FileUtils.ValidateFilePath(path);
+
+            // Assert
+            Assert.DoesNotThrow(call);
+        }
+
+        [Test]
+        [TestCase(null)]
+        [TestCase("")]
+        [TestCase("   ")]
+        public void ValidateFilePath_InvalidEmptyPath_ThrowsArgumentException(string invalidPath)
+        {
+            // Call
+            TestDelegate call = () => FileUtils.ValidateFilePath(invalidPath);
+
+            // Assert
+            var exception = Assert.Throws<ArgumentException>(call);
+            var expectedMessage = string.Format("Fout bij het lezen van bestand '{0}': Bestandspad mag niet leeg of ongedefinieerd zijn.", invalidPath);
+            Assert.AreEqual(expectedMessage, exception.Message);
+        }
+
+        [Test]
+        public void ValidateFilePath_PathContainingInvalidFileCharacters_ThrowsArgumentException()
+        {
+            // Setup
+            var path = TestHelper.GetTestDataPath(TestDataPath.Core.Common.Utils, "validFile.txt");
+            var invalidFileNameChars = Path.GetInvalidFileNameChars();
+            var invalidPath = path.Replace('d', invalidFileNameChars[0]);
+
+            // Call
+            TestDelegate call = () => FileUtils.ValidateFilePath(invalidPath);
+
+            // Assert
+            var exception = Assert.Throws<ArgumentException>(call);
+            var expectedMessage = String.Format("Fout bij het lezen van bestand '{0}': Bestandspad mag niet de volgende tekens bevatten: {1}",
+                                                invalidPath, string.Join(", ", invalidFileNameChars));
+            Assert.AreEqual(expectedMessage, exception.Message);
+        }
+
+        [Test]
+        public void ValidateFilePath_PathIsActuallyFolder_ThrowsArgumentException()
+        {
+            // Setup
+            var folderPath = TestHelper.GetTestDataPath(TestDataPath.Core.Common.Utils) + Path.DirectorySeparatorChar;
+
+            // Call
+            TestDelegate call = () => FileUtils.ValidateFilePath(folderPath);
+
+            // Assert
+            var exception = Assert.Throws<ArgumentException>(call);
+            var expectedMessage = String.Format("Fout bij het lezen van bestand '{0}': Bestandspad mag niet naar een map verwijzen.", folderPath);
+            Assert.AreEqual(expectedMessage, exception.Message);
+        }
+    }
+}
\ No newline at end of file
Index: Core/Common/test/Core.Common.Utils.Test/Properties/Resources.Designer.cs
===================================================================
diff -u -r632b9c8cd36e7663a17e53320d3bfedb873889e0 -r654d3a712eedbdeea718dc0448c5544f09e053cd
--- Core/Common/test/Core.Common.Utils.Test/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 632b9c8cd36e7663a17e53320d3bfedb873889e0)
+++ Core/Common/test/Core.Common.Utils.Test/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 654d3a712eedbdeea718dc0448c5544f09e053cd)
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18444
+//     Runtime Version:4.0.30319.42000
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
Index: Core/Common/test/Core.Common.Utils.Test/TestHelperTests.cs
===================================================================
diff -u -r9c29a906e8ee9c993982d4dc4a3bf2e148af40a0 -r654d3a712eedbdeea718dc0448c5544f09e053cd
--- Core/Common/test/Core.Common.Utils.Test/TestHelperTests.cs	(.../TestHelperTests.cs)	(revision 9c29a906e8ee9c993982d4dc4a3bf2e148af40a0)
+++ Core/Common/test/Core.Common.Utils.Test/TestHelperTests.cs	(.../TestHelperTests.cs)	(revision 654d3a712eedbdeea718dc0448c5544f09e053cd)
@@ -31,15 +31,19 @@
         }
 
         [Test]
-        public void TestPredefinedTestPath()
+        public void GetTestDataPath_Always_VerifiedTestPaths()
         {
-            // common
-            var path = TestHelper.GetTestDataPath(TestDataPath.Common.Base.CoreCommonBaseTests);
+            // Core Common Base
+            var path = TestHelper.GetTestDataPath(TestDataPath.Core.Common.Base);
             Assert.IsTrue(Directory.Exists(path));
 
-            // Ringtoets
-            path = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.CorePluginsSharpMapGisTests);
+            // Core Common Utils
+            path = TestHelper.GetTestDataPath(TestDataPath.Core.Common.Utils);
             Assert.IsTrue(Directory.Exists(path));
+
+            // Ringtoets Piping IO
+            path = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Piping.IO);
+            Assert.IsTrue(Directory.Exists(path));
         }
 
         [Test]
@@ -56,36 +60,6 @@
             TestHelper.AssertLogMessageIsGenerated(() => log.Error("hello"), "hello");
         }
 
-        private static void DeleteIfExists(string path)
-        {
-            if (!File.Exists(path) & !Directory.Exists(path))
-            {
-                return;
-            }
-
-            var attributes = File.GetAttributes(path);
-
-            // if file is readonly - make it non-readonly
-            if ((attributes & FileAttributes.ReadOnly) == FileAttributes.ReadOnly)
-            {
-                File.SetAttributes(path, attributes ^ FileAttributes.ReadOnly);
-            }
-
-            // now delete everything
-            if (File.Exists(path))
-            {
-                File.Delete(path);
-            }
-            else if (Directory.Exists(path))
-            {
-                foreach (var path2 in Directory.GetDirectories(path).Union(Directory.GetFiles(path)))
-                {
-                    DeleteIfExists(path2);
-                }
-                Directory.Delete(path);
-            }
-        }
-
         [Test]
         public void TestAssertLogMessagesCount()
         {
@@ -102,7 +76,7 @@
 
             // Call
             TestDelegate call = () => TestHelper.AssertImagesAreEqual(image, image);
-            
+
             // Assert
             Assert.DoesNotThrow(call);
         }
@@ -170,10 +144,7 @@
             contextMenuStrip.Items.Add(testItem);
 
             // Call
-            TestDelegate call = () =>
-            {
-                TestHelper.AssertContextMenuStripContainsItem(contextMenuStrip, 0, testItem.Text + "someThing", testItem.ToolTipText, testItem.Image);
-            };
+            TestDelegate call = () => { TestHelper.AssertContextMenuStripContainsItem(contextMenuStrip, 0, testItem.Text + "someThing", testItem.ToolTipText, testItem.Image); };
 
             // Assert
             Assert.Throws<AssertionException>(call);
@@ -188,10 +159,7 @@
             contextMenuStrip.Items.Add(testItem);
 
             // Call
-            TestDelegate call = () =>
-            {
-                TestHelper.AssertContextMenuStripContainsItem(contextMenuStrip, 0, testItem.Text, testItem.ToolTipText + "someThing", testItem.Image);
-            };
+            TestDelegate call = () => { TestHelper.AssertContextMenuStripContainsItem(contextMenuStrip, 0, testItem.Text, testItem.ToolTipText + "someThing", testItem.Image); };
 
             // Assert
             Assert.Throws<AssertionException>(call);
@@ -206,10 +174,7 @@
             contextMenuStrip.Items.Add(testItem);
 
             // Call
-            TestDelegate call = () =>
-            {
-                TestHelper.AssertContextMenuStripContainsItem(contextMenuStrip, 0, testItem.Text, testItem.ToolTipText, Resources.acorn);
-            };
+            TestDelegate call = () => { TestHelper.AssertContextMenuStripContainsItem(contextMenuStrip, 0, testItem.Text, testItem.ToolTipText, Resources.acorn); };
 
             // Assert
             Assert.Throws<AssertionException>(call);
@@ -227,10 +192,7 @@
             contextMenuStrip.Items.Add(testItem);
 
             // Call
-            TestDelegate call = () =>
-            {
-                TestHelper.AssertContextMenuStripContainsItem(contextMenuStrip, 0, testItem.Text, testItem.ToolTipText, testItem.Image, !enabled);
-            };
+            TestDelegate call = () => { TestHelper.AssertContextMenuStripContainsItem(contextMenuStrip, 0, testItem.Text, testItem.ToolTipText, testItem.Image, !enabled); };
 
             // Assert
             Assert.Throws<AssertionException>(call);
@@ -277,10 +239,7 @@
             dropDownItem.DropDownItems.Add(testItem);
 
             // Call
-            TestDelegate call = () =>
-            {
-                TestHelper.AssertDropDownItemContainsItem(dropDownItem, 0, testItem.Text + "someThing", testItem.ToolTipText, testItem.Image);
-            };
+            TestDelegate call = () => { TestHelper.AssertDropDownItemContainsItem(dropDownItem, 0, testItem.Text + "someThing", testItem.ToolTipText, testItem.Image); };
 
             // Assert
             Assert.Throws<AssertionException>(call);
@@ -295,10 +254,7 @@
             dropDownItem.DropDownItems.Add(testItem);
 
             // Call
-            TestDelegate call = () =>
-            {
-                TestHelper.AssertDropDownItemContainsItem(dropDownItem, 0, testItem.Text, testItem.ToolTipText + "someThing", testItem.Image);
-            };
+            TestDelegate call = () => { TestHelper.AssertDropDownItemContainsItem(dropDownItem, 0, testItem.Text, testItem.ToolTipText + "someThing", testItem.Image); };
 
             // Assert
             Assert.Throws<AssertionException>(call);
@@ -313,10 +269,7 @@
             dropDownItem.DropDownItems.Add(testItem);
 
             // Call
-            TestDelegate call = () =>
-            {
-                TestHelper.AssertDropDownItemContainsItem(dropDownItem, 0, testItem.Text, testItem.ToolTipText, Resources.acorn);
-            };
+            TestDelegate call = () => { TestHelper.AssertDropDownItemContainsItem(dropDownItem, 0, testItem.Text, testItem.ToolTipText, Resources.acorn); };
 
             // Assert
             Assert.Throws<AssertionException>(call);
@@ -334,10 +287,7 @@
             dropDownItem.DropDownItems.Add(testItem);
 
             // Call
-            TestDelegate call = () =>
-            {
-                TestHelper.AssertDropDownItemContainsItem(dropDownItem, 0, testItem.Text, testItem.ToolTipText, testItem.Image, !enabled);
-            };
+            TestDelegate call = () => { TestHelper.AssertDropDownItemContainsItem(dropDownItem, 0, testItem.Text, testItem.ToolTipText, testItem.Image, !enabled); };
 
             // Assert
             Assert.Throws<AssertionException>(call);
@@ -362,10 +312,7 @@
             TestDelegate t = () => { };
 
             // Call
-            TestDelegate call = () =>
-            {
-                TestHelper.AssertThrowsArgumentExceptionAndTestMessage<ArgumentException>(t, String.Empty);
-            };
+            TestDelegate call = () => { TestHelper.AssertThrowsArgumentExceptionAndTestMessage<ArgumentException>(t, String.Empty); };
 
             // Assert
             Assert.Throws<AssertionException>(call);
@@ -380,10 +327,7 @@
             TestDelegate t = () => { throw new ArgumentException(someMessage); };
 
             // Call
-            TestDelegate call = () =>
-            {
-                TestHelper.AssertThrowsArgumentExceptionAndTestMessage<ArgumentException>(t, differentMessage);
-            };
+            TestDelegate call = () => { TestHelper.AssertThrowsArgumentExceptionAndTestMessage<ArgumentException>(t, differentMessage); };
 
             // Assert
             Assert.Throws<AssertionException>(call);
@@ -402,7 +346,6 @@
             TestHelper.AssertThrowsArgumentExceptionAndTestMessage<ArgumentException>(t, someMessage);
         }
 
-
         [Test]
         [TestCase("param")]
         [TestCase(null)]
@@ -416,6 +359,36 @@
             TestHelper.AssertThrowsArgumentExceptionAndTestMessage<ArgumentException>(t, someMessage);
         }
 
+        private static void DeleteIfExists(string path)
+        {
+            if (!File.Exists(path) & !Directory.Exists(path))
+            {
+                return;
+            }
+
+            var attributes = File.GetAttributes(path);
+
+            // if file is readonly - make it non-readonly
+            if ((attributes & FileAttributes.ReadOnly) == FileAttributes.ReadOnly)
+            {
+                File.SetAttributes(path, attributes ^ FileAttributes.ReadOnly);
+            }
+
+            // now delete everything
+            if (File.Exists(path))
+            {
+                File.Delete(path);
+            }
+            else if (Directory.Exists(path))
+            {
+                foreach (var path2 in Directory.GetDirectories(path).Union(Directory.GetFiles(path)))
+                {
+                    DeleteIfExists(path2);
+                }
+                Directory.Delete(path);
+            }
+        }
+
         private static ToolStripMenuItem CreateContextMenuItem()
         {
             return new ToolStripMenuItem
Fisheye: Tag 654d3a712eedbdeea718dc0448c5544f09e053cd refers to a dead (removed) revision in file `Ringtoets/Piping/src/Ringtoets.Piping.IO/Builders/FileReaderErrorMessageBuilder.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 654d3a712eedbdeea718dc0448c5544f09e053cd refers to a dead (removed) revision in file `Ringtoets/Piping/src/Ringtoets.Piping.IO/FileUtils.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/Piping/src/Ringtoets.Piping.IO/PipingSurfaceLinesCsvReader.cs
===================================================================
diff -u -ref38400fe2872ca260d04a30a80de72492b569ad -r654d3a712eedbdeea718dc0448c5544f09e053cd
--- Ringtoets/Piping/src/Ringtoets.Piping.IO/PipingSurfaceLinesCsvReader.cs	(.../PipingSurfaceLinesCsvReader.cs)	(revision ef38400fe2872ca260d04a30a80de72492b569ad)
+++ Ringtoets/Piping/src/Ringtoets.Piping.IO/PipingSurfaceLinesCsvReader.cs	(.../PipingSurfaceLinesCsvReader.cs)	(revision 654d3a712eedbdeea718dc0448c5544f09e053cd)
@@ -3,11 +3,12 @@
 using System.Globalization;
 using System.IO;
 using System.Linq;
-
+using Core.Common.Utils;
+using Core.Common.Utils.Builders;
 using Ringtoets.Piping.Data;
-using Ringtoets.Piping.IO.Builders;
 using Ringtoets.Piping.IO.Exceptions;
 using Ringtoets.Piping.IO.Properties;
+using UtilsResources = Core.Common.Utils.Properties.Resources;
 
 namespace Ringtoets.Piping.IO
 {
@@ -142,6 +143,15 @@
             return null;
         }
 
+        public void Dispose()
+        {
+            if (fileReader != null)
+            {
+                fileReader.Dispose();
+                fileReader = null;
+            }
+        }
+
         /// <summary>
         /// Checks if the geometry defining the surface line is valid.
         /// </summary>
@@ -159,15 +169,6 @@
             }
         }
 
-        public void Dispose()
-        {
-            if (fileReader != null)
-            {
-                fileReader.Dispose();
-                fileReader = null;
-            }
-        }
-
         /// <summary>
         /// Tokenizes a string using a separator character up to the first empty field.
         /// </summary>
@@ -204,20 +205,20 @@
             const int expectedValuesForPoint = 3;
 
             var worldCoordinateValues = ParseWorldCoordinateValuesAndHandleParseErrors(tokenizedString, surfaceLineName);
-            if (worldCoordinateValues.Length % expectedValuesForPoint != 0)
+            if (worldCoordinateValues.Length%expectedValuesForPoint != 0)
             {
                 throw CreateLineParseException(lineNumber, surfaceLineName, Resources.PipingSurfaceLinesCsvReader_ReadLine_SurfaceLine_lacks_values_for_coordinate_triplet);
             }
 
-            int coordinateCount = worldCoordinateValues.Length / expectedValuesForPoint;
+            int coordinateCount = worldCoordinateValues.Length/expectedValuesForPoint;
             var points = new Point3D[coordinateCount];
             for (int i = 0; i < coordinateCount; i++)
             {
                 points[i] = new Point3D
                 {
-                    X = worldCoordinateValues[i * expectedValuesForPoint],
-                    Y = worldCoordinateValues[i * expectedValuesForPoint + 1],
-                    Z = worldCoordinateValues[i * expectedValuesForPoint + 2]
+                    X = worldCoordinateValues[i*expectedValuesForPoint],
+                    Y = worldCoordinateValues[i*expectedValuesForPoint + 1],
+                    Z = worldCoordinateValues[i*expectedValuesForPoint + 2]
                 };
             }
             return points;
@@ -284,17 +285,17 @@
             }
             catch (FileNotFoundException e)
             {
-                string message = new FileReaderErrorMessageBuilder(path).Build(Resources.Error_File_does_not_exist);
+                string message = new FileReaderErrorMessageBuilder(path).Build(UtilsResources.Error_File_does_not_exist);
                 throw new CriticalFileReadException(message, e);
             }
             catch (DirectoryNotFoundException e)
             {
-                string message = new FileReaderErrorMessageBuilder(path).Build(Resources.Error_Directory_missing);
+                string message = new FileReaderErrorMessageBuilder(path).Build(UtilsResources.Error_Directory_missing);
                 throw new CriticalFileReadException(message, e);
             }
             catch (IOException e)
             {
-                var message = new FileReaderErrorMessageBuilder(path).Build(string.Format(Resources.Error_General_IO_ErrorMessage_0_, e.Message));
+                var message = new FileReaderErrorMessageBuilder(path).Build(string.Format(UtilsResources.Error_General_IO_ErrorMessage_0_, e.Message));
                 throw new CriticalFileReadException(message, e);
             }
         }
@@ -317,7 +318,7 @@
             }
             else
             {
-                throw CreateCriticalFileReadException(currentLine, Resources.Error_File_empty);
+                throw CreateCriticalFileReadException(currentLine, UtilsResources.Error_File_empty);
             }
         }
 
@@ -405,11 +406,11 @@
             }
             catch (OutOfMemoryException e)
             {
-                throw CreateCriticalFileReadException(currentLine, Resources.Error_File_does_not_exist, e);
+                throw CreateCriticalFileReadException(currentLine, UtilsResources.Error_File_does_not_exist, e);
             }
             catch (IOException e)
             {
-                var message = new FileReaderErrorMessageBuilder(filePath).Build(string.Format(Resources.Error_General_IO_ErrorMessage_0_, e.Message));
+                var message = new FileReaderErrorMessageBuilder(filePath).Build(string.Format(UtilsResources.Error_General_IO_ErrorMessage_0_, e.Message));
                 throw new CriticalFileReadException(message, e);
             }
         }
Index: Ringtoets/Piping/src/Ringtoets.Piping.IO/Properties/Resources.Designer.cs
===================================================================
diff -u -r83b9621346f7f3ca887096468de965815eb609ac -r654d3a712eedbdeea718dc0448c5544f09e053cd
--- Ringtoets/Piping/src/Ringtoets.Piping.IO/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 83b9621346f7f3ca887096468de965815eb609ac)
+++ Ringtoets/Piping/src/Ringtoets.Piping.IO/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 654d3a712eedbdeea718dc0448c5544f09e053cd)
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.34209
+//     Runtime Version:4.0.30319.42000
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -70,78 +70,6 @@
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Het bestandspad verwijst naar een map die niet bestaat..
-        /// </summary>
-        public static string Error_Directory_missing {
-            get {
-                return ResourceManager.GetString("Error_Directory_missing", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Het bestand bestaat niet..
-        /// </summary>
-        public static string Error_File_does_not_exist {
-            get {
-                return ResourceManager.GetString("Error_File_does_not_exist", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Het bestand is leeg..
-        /// </summary>
-        public static string Error_File_empty {
-            get {
-                return ResourceManager.GetString("Error_File_empty", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Er is een onverwachte fout opgetreden tijdens het inlezen van het bestand: {0}.
-        /// </summary>
-        public static string Error_General_IO_ErrorMessage_0_ {
-            get {
-                return ResourceManager.GetString("Error_General_IO_ErrorMessage_0_", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Regel bevat te veel tekst om in het RAM geheugen opgeslagen te worden..
-        /// </summary>
-        public static string Error_Line_too_big_for_RAM {
-            get {
-                return ResourceManager.GetString("Error_Line_too_big_for_RAM", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Bestandspad mag niet de volgende tekens bevatten: {0}.
-        /// </summary>
-        public static string Error_Path_cannot_contain_Characters_0_ {
-            get {
-                return ResourceManager.GetString("Error_Path_cannot_contain_Characters_0_", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Bestandspad mag niet leeg of ongedefinieerd zijn..
-        /// </summary>
-        public static string Error_Path_must_be_specified {
-            get {
-                return ResourceManager.GetString("Error_Path_must_be_specified", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Bestandspad mag niet naar een map verwijzen..
-        /// </summary>
-        public static string Error_Path_must_not_point_to_folder {
-            get {
-                return ResourceManager.GetString("Error_Path_must_not_point_to_folder", resourceCulture);
-            }
-        }
-        
-        /// <summary>
         ///   Looks up a localized string similar to Kon geen ondergrond profielen verkrijgen van de database..
         /// </summary>
         public static string Error_SoilProfile_read_from_database {
Index: Ringtoets/Piping/src/Ringtoets.Piping.IO/Properties/Resources.resx
===================================================================
diff -u -r83b9621346f7f3ca887096468de965815eb609ac -r654d3a712eedbdeea718dc0448c5544f09e053cd
--- Ringtoets/Piping/src/Ringtoets.Piping.IO/Properties/Resources.resx	(.../Resources.resx)	(revision 83b9621346f7f3ca887096468de965815eb609ac)
+++ Ringtoets/Piping/src/Ringtoets.Piping.IO/Properties/Resources.resx	(.../Resources.resx)	(revision 654d3a712eedbdeea718dc0448c5544f09e053cd)
@@ -120,36 +120,12 @@
   <data name="Error_Can_not_determine_1D_profile_with_vertical_segments_at_X_0_" xml:space="preserve">
     <value>Er kan geen 1D-profiel bepaald worden wanneer segmenten in een 2D laag verticaal lopen op de gekozen positie: x = {0}.</value>
   </data>
-  <data name="Error_Directory_missing" xml:space="preserve">
-    <value>Het bestandspad verwijst naar een map die niet bestaat.</value>
-  </data>
-  <data name="Error_Line_too_big_for_RAM" xml:space="preserve">
-    <value>Regel bevat te veel tekst om in het RAM geheugen opgeslagen te worden.</value>
-  </data>
-  <data name="Error_File_does_not_exist" xml:space="preserve">
-    <value>Het bestand bestaat niet.</value>
-  </data>
-  <data name="Error_File_empty" xml:space="preserve">
-    <value>Het bestand is leeg.</value>
-  </data>
   <data name="Error_SurfaceLine_has_not_double" xml:space="preserve">
     <value>Profielmeting heeft een waarde die niet omgezet kan worden naar een getal.</value>
   </data>
   <data name="Error_SurfaceLine_parsing_causes_overflow" xml:space="preserve">
     <value>Profielmeting heeft een waarde die te groot of te klein is om ingelezen te worden.</value>
   </data>
-  <data name="Error_General_IO_ErrorMessage_0_" xml:space="preserve">
-    <value>Er is een onverwachte fout opgetreden tijdens het inlezen van het bestand: {0}</value>
-  </data>
-  <data name="Error_Path_cannot_contain_Characters_0_" xml:space="preserve">
-    <value>Bestandspad mag niet de volgende tekens bevatten: {0}</value>
-  </data>
-  <data name="Error_Path_must_be_specified" xml:space="preserve">
-    <value>Bestandspad mag niet leeg of ongedefinieerd zijn.</value>
-  </data>
-  <data name="Error_Path_must_not_point_to_folder" xml:space="preserve">
-    <value>Bestandspad mag niet naar een map verwijzen.</value>
-  </data>
   <data name="Error_SoilProfileBuilder_cant_determine_intersect_SoilProfileName_0_at_double_NaN" xml:space="preserve">
     <value>Geen geldige X waarde gevonden om intersectie te maken uit 2D profiel '{0}'.</value>
   </data>
Index: Ringtoets/Piping/src/Ringtoets.Piping.IO/Ringtoets.Piping.IO.csproj
===================================================================
diff -u -r443423bba9710843153b9afda01bbee47cd1b298 -r654d3a712eedbdeea718dc0448c5544f09e053cd
--- Ringtoets/Piping/src/Ringtoets.Piping.IO/Ringtoets.Piping.IO.csproj	(.../Ringtoets.Piping.IO.csproj)	(revision 443423bba9710843153b9afda01bbee47cd1b298)
+++ Ringtoets/Piping/src/Ringtoets.Piping.IO/Ringtoets.Piping.IO.csproj	(.../Ringtoets.Piping.IO.csproj)	(revision 654d3a712eedbdeea718dc0448c5544f09e053cd)
@@ -42,7 +42,6 @@
     <Compile Include="..\..\..\..\Core\Common\src\Core.Common.Version\GlobalAssembly.cs">
       <Link>Properties\GlobalAssembly.cs</Link>
     </Compile>
-    <Compile Include="Builders\FileReaderErrorMessageBuilder.cs" />
     <Compile Include="Builders\SoilLayer1D.cs" />
     <Compile Include="Builders\SoilProfileBuilderException.cs" />
     <Compile Include="Builders\SoilLayer2D.cs" />
@@ -52,7 +51,6 @@
     <Compile Include="Exceptions\CriticalFileReadException.cs" />
     <Compile Include="Exceptions\LineParseException.cs" />
     <Compile Include="Exceptions\PipingSoilProfileReadException.cs" />
-    <Compile Include="FileUtils.cs" />
     <Compile Include="SoilProfile\CriticalProfileProperties.cs" />
     <Compile Include="SoilProfile\IRowBasedDatabaseReader.cs" />
     <Compile Include="SoilProfile\SoilLayer2DReader.cs" />
@@ -69,6 +67,10 @@
     <Compile Include="SoilProfile\SoilProfileDatabaseColumns.cs" />
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Utils\Core.Common.Utils.csproj">
+      <Project>{f49bd8b2-332a-4c91-a196-8cce0a2c7d98}</Project>
+      <Name>Core.Common.Utils</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Version\Core.Common.Version.csproj">
       <Project>{c90b77da-e421-43cc-b82e-529651bc21ac}</Project>
       <Name>Core.Common.Version</Name>
Index: Ringtoets/Piping/src/Ringtoets.Piping.IO/SoilProfile/CriticalProfileProperties.cs
===================================================================
diff -u -rd082f5444ccd9571f4fabb4c47f1082fa5ece21e -r654d3a712eedbdeea718dc0448c5544f09e053cd
--- Ringtoets/Piping/src/Ringtoets.Piping.IO/SoilProfile/CriticalProfileProperties.cs	(.../CriticalProfileProperties.cs)	(revision d082f5444ccd9571f4fabb4c47f1082fa5ece21e)
+++ Ringtoets/Piping/src/Ringtoets.Piping.IO/SoilProfile/CriticalProfileProperties.cs	(.../CriticalProfileProperties.cs)	(revision 654d3a712eedbdeea718dc0448c5544f09e053cd)
@@ -1,6 +1,5 @@
 using System;
-
-using Ringtoets.Piping.IO.Builders;
+using Core.Common.Utils.Builders;
 using Ringtoets.Piping.IO.Exceptions;
 using Ringtoets.Piping.IO.Properties;
 
Index: Ringtoets/Piping/src/Ringtoets.Piping.IO/SoilProfile/IRowBasedDatabaseReader.cs
===================================================================
diff -u -rd082f5444ccd9571f4fabb4c47f1082fa5ece21e -r654d3a712eedbdeea718dc0448c5544f09e053cd
--- Ringtoets/Piping/src/Ringtoets.Piping.IO/SoilProfile/IRowBasedDatabaseReader.cs	(.../IRowBasedDatabaseReader.cs)	(revision d082f5444ccd9571f4fabb4c47f1082fa5ece21e)
+++ Ringtoets/Piping/src/Ringtoets.Piping.IO/SoilProfile/IRowBasedDatabaseReader.cs	(.../IRowBasedDatabaseReader.cs)	(revision 654d3a712eedbdeea718dc0448c5544f09e053cd)
@@ -9,6 +9,11 @@
     internal interface IRowBasedDatabaseReader
     {
         /// <summary>
+        /// Gets the path of the database being read.
+        /// </summary>
+        string Path { get; }
+
+        /// <summary>
         /// Moves the reader to the next record in the database.
         /// </summary>
         void MoveNext();
@@ -31,10 +36,5 @@
         /// <returns>The value in the column, or <c>null</c> if the value was <see cref="DBNull.Value"/>.</returns>
         /// <exception cref="InvalidCastException">Thrown when the value in the column could not be casted to type <typeparamref name="T"/>.</exception>
         T? ReadOrNull<T>(string columnName) where T : struct;
-
-        /// <summary>
-        /// Gets the path of the database being read.
-        /// </summary>
-        string Path { get; }
     }
 }
\ No newline at end of file
Index: Ringtoets/Piping/src/Ringtoets.Piping.IO/SoilProfile/PipingSoilProfileReader.cs
===================================================================
diff -u -rd082f5444ccd9571f4fabb4c47f1082fa5ece21e -r654d3a712eedbdeea718dc0448c5544f09e053cd
--- Ringtoets/Piping/src/Ringtoets.Piping.IO/SoilProfile/PipingSoilProfileReader.cs	(.../PipingSoilProfileReader.cs)	(revision d082f5444ccd9571f4fabb4c47f1082fa5ece21e)
+++ Ringtoets/Piping/src/Ringtoets.Piping.IO/SoilProfile/PipingSoilProfileReader.cs	(.../PipingSoilProfileReader.cs)	(revision 654d3a712eedbdeea718dc0448c5544f09e053cd)
@@ -2,10 +2,12 @@
 using System.Data;
 using System.Data.SQLite;
 using System.IO;
+using Core.Common.Utils;
+using Core.Common.Utils.Builders;
 using Ringtoets.Piping.Data;
-using Ringtoets.Piping.IO.Builders;
 using Ringtoets.Piping.IO.Exceptions;
 using Ringtoets.Piping.IO.Properties;
+using UtilsResources = Core.Common.Utils.Properties.Resources;
 
 namespace Ringtoets.Piping.IO.SoilProfile
 {
@@ -48,7 +50,7 @@
             }
             if (!File.Exists(databaseFilePath))
             {
-                var message = new FileReaderErrorMessageBuilder(databaseFilePath).Build(Resources.Error_File_does_not_exist);
+                var message = new FileReaderErrorMessageBuilder(databaseFilePath).Build(UtilsResources.Error_File_does_not_exist);
                 throw new CriticalFileReadException(message);
             }
 
Index: Ringtoets/Piping/src/Ringtoets.Piping.IO/SoilProfile/SoilProfile1DReader.cs
===================================================================
diff -u -rd082f5444ccd9571f4fabb4c47f1082fa5ece21e -r654d3a712eedbdeea718dc0448c5544f09e053cd
--- Ringtoets/Piping/src/Ringtoets.Piping.IO/SoilProfile/SoilProfile1DReader.cs	(.../SoilProfile1DReader.cs)	(revision d082f5444ccd9571f4fabb4c47f1082fa5ece21e)
+++ Ringtoets/Piping/src/Ringtoets.Piping.IO/SoilProfile/SoilProfile1DReader.cs	(.../SoilProfile1DReader.cs)	(revision 654d3a712eedbdeea718dc0448c5544f09e053cd)
@@ -1,5 +1,6 @@
 using System;
 using System.Data.SQLite;
+using Core.Common.Utils.Builders;
 using Ringtoets.Piping.Data;
 using Ringtoets.Piping.IO.Builders;
 using Ringtoets.Piping.IO.Exceptions;
@@ -76,36 +77,6 @@
             return pipingSoilLayer;
         }
 
-        private class RequiredProfileProperties
-        {
-            internal readonly double Bottom;
-
-            /// <summary>
-            /// Creates a new instance of <see cref="RequiredProfileProperties"/>, which contains properties
-            /// that are required to create a complete <see cref="PipingSoilProfile"/>. If these properties
-            /// cannot be read, then the reader can proceed to the next profile.
-            /// </summary>
-            /// <param name="reader">The <see cref="SQLiteDataReader"/> to read the required profile property values from.</param>
-            /// <param name="profileName">The profile name used in generating exceptions messages if casting failed.</param>
-            /// <exception cref="PipingSoilProfileReadException">Thrown when the values in the database could not be 
-            /// casted to the expected column types.</exception>
-            internal RequiredProfileProperties(IRowBasedDatabaseReader reader, string profileName)
-            {
-                string readColumn = SoilProfileDatabaseColumns.Bottom;
-                try
-                {
-                    Bottom = reader.Read<double>(readColumn);
-                }
-                catch (InvalidCastException e)
-                {
-                    var message = new FileReaderErrorMessageBuilder(reader.Path)
-                        .WithSubject(string.Format(Resources.PipingSoilProfileReader_SoilProfileName_0_, profileName))
-                        .Build(string.Format(Resources.PipingSoilProfileReader_Profile_has_invalid_value_on_Column_0_, readColumn));
-                    throw new PipingSoilProfileReadException(profileName, message, e);
-                }
-            }
-        }
-
         private class LayerProperties
         {
             internal readonly double Top;
@@ -151,5 +122,35 @@
                 }
             }
         }
+
+        private class RequiredProfileProperties
+        {
+            internal readonly double Bottom;
+
+            /// <summary>
+            /// Creates a new instance of <see cref="RequiredProfileProperties"/>, which contains properties
+            /// that are required to create a complete <see cref="PipingSoilProfile"/>. If these properties
+            /// cannot be read, then the reader can proceed to the next profile.
+            /// </summary>
+            /// <param name="reader">The <see cref="SQLiteDataReader"/> to read the required profile property values from.</param>
+            /// <param name="profileName">The profile name used in generating exceptions messages if casting failed.</param>
+            /// <exception cref="PipingSoilProfileReadException">Thrown when the values in the database could not be 
+            /// casted to the expected column types.</exception>
+            internal RequiredProfileProperties(IRowBasedDatabaseReader reader, string profileName)
+            {
+                string readColumn = SoilProfileDatabaseColumns.Bottom;
+                try
+                {
+                    Bottom = reader.Read<double>(readColumn);
+                }
+                catch (InvalidCastException e)
+                {
+                    var message = new FileReaderErrorMessageBuilder(reader.Path)
+                        .WithSubject(string.Format(Resources.PipingSoilProfileReader_SoilProfileName_0_, profileName))
+                        .Build(string.Format(Resources.PipingSoilProfileReader_Profile_has_invalid_value_on_Column_0_, readColumn));
+                    throw new PipingSoilProfileReadException(profileName, message, e);
+                }
+            }
+        }
     }
 }
\ No newline at end of file
Index: Ringtoets/Piping/src/Ringtoets.Piping.IO/SoilProfile/SoilProfile2DReader.cs
===================================================================
diff -u -rd082f5444ccd9571f4fabb4c47f1082fa5ece21e -r654d3a712eedbdeea718dc0448c5544f09e053cd
--- Ringtoets/Piping/src/Ringtoets.Piping.IO/SoilProfile/SoilProfile2DReader.cs	(.../SoilProfile2DReader.cs)	(revision d082f5444ccd9571f4fabb4c47f1082fa5ece21e)
+++ Ringtoets/Piping/src/Ringtoets.Piping.IO/SoilProfile/SoilProfile2DReader.cs	(.../SoilProfile2DReader.cs)	(revision 654d3a712eedbdeea718dc0448c5544f09e053cd)
@@ -1,6 +1,6 @@
 using System;
 using System.Data.SQLite;
-
+using Core.Common.Utils.Builders;
 using Ringtoets.Piping.Data;
 using Ringtoets.Piping.IO.Builders;
 using Ringtoets.Piping.IO.Exceptions;
Fisheye: Tag 654d3a712eedbdeea718dc0448c5544f09e053cd refers to a dead (removed) revision in file `Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Builders/FileReaderErrorMessageBuilderTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 654d3a712eedbdeea718dc0448c5544f09e053cd refers to a dead (removed) revision in file `Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/FileUtilsTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/PipingSurfaceLinesCsvReaderTest.cs
===================================================================
diff -u -r7612d0b14bca5e0686b654dc0ffb96fcc0ff0a2b -r654d3a712eedbdeea718dc0448c5544f09e053cd
--- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/PipingSurfaceLinesCsvReaderTest.cs	(.../PipingSurfaceLinesCsvReaderTest.cs)	(revision 7612d0b14bca5e0686b654dc0ffb96fcc0ff0a2b)
+++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/PipingSurfaceLinesCsvReaderTest.cs	(.../PipingSurfaceLinesCsvReaderTest.cs)	(revision 654d3a712eedbdeea718dc0448c5544f09e053cd)
@@ -2,12 +2,11 @@
 using System.IO;
 using System.Linq;
 using Core.Common.TestUtil;
+using Core.Common.Utils.Builders;
 using NUnit.Framework;
-
-using Ringtoets.Piping.IO.Builders;
 using Ringtoets.Piping.IO.Exceptions;
-
 using IOResources = Ringtoets.Piping.IO.Properties.Resources;
+using UtilsResources = Core.Common.Utils.Properties.Resources;
 
 namespace Ringtoets.Piping.IO.Test
 {
@@ -27,7 +26,7 @@
 
             // Assert
             var exception = Assert.Throws<ArgumentException>(call);
-            var expectedMessage = new FileReaderErrorMessageBuilder(path).Build(IOResources.Error_Path_must_be_specified);
+            var expectedMessage = new FileReaderErrorMessageBuilder(path).Build(UtilsResources.Error_Path_must_be_specified);
             Assert.AreEqual(expectedMessage, exception.Message);
         }
 
@@ -46,7 +45,7 @@
 
             // Assert
             var exception = Assert.Throws<ArgumentException>(call);
-            var expectedMessage = new FileReaderErrorMessageBuilder(corruptPath).Build(String.Format(IOResources.Error_Path_cannot_contain_Characters_0_,
+            var expectedMessage = new FileReaderErrorMessageBuilder(corruptPath).Build(String.Format(UtilsResources.Error_Path_cannot_contain_Characters_0_,
                                                                                               String.Join(", ", Path.GetInvalidFileNameChars())));
             Assert.AreEqual(expectedMessage, exception.Message);
         }
@@ -59,7 +58,7 @@
 
             // Assert
             var exception = Assert.Throws<ArgumentException>(call);
-            var expectedMessage = new FileReaderErrorMessageBuilder(testDataPath).Build(IOResources.Error_Path_must_not_point_to_folder);
+            var expectedMessage = new FileReaderErrorMessageBuilder(testDataPath).Build(UtilsResources.Error_Path_must_not_point_to_folder);
             Assert.AreEqual(expectedMessage, exception.Message);
         }
 
@@ -125,7 +124,7 @@
 
                 // Assert
                 var exception = Assert.Throws<CriticalFileReadException>(call);
-                var expectedError = new FileReaderErrorMessageBuilder(path).Build(IOResources.Error_File_does_not_exist);
+                var expectedError = new FileReaderErrorMessageBuilder(path).Build(UtilsResources.Error_File_does_not_exist);
                 Assert.AreEqual(expectedError, exception.Message);
                 Assert.IsInstanceOf<FileNotFoundException>(exception.InnerException);
             }
@@ -147,7 +146,7 @@
 
                 // Assert
                 var exception = Assert.Throws<CriticalFileReadException>(call);
-                var expectedMessage = new FileReaderErrorMessageBuilder(path).Build(IOResources.Error_Directory_missing);
+                var expectedMessage = new FileReaderErrorMessageBuilder(path).Build(UtilsResources.Error_Directory_missing);
                 Assert.AreEqual(expectedMessage, exception.Message);
                 Assert.IsInstanceOf<DirectoryNotFoundException>(exception.InnerException);
             }
@@ -169,7 +168,7 @@
 
                 // Assert
                 var exception = Assert.Throws<CriticalFileReadException>(call);
-                var expectedMessage = new FileReaderErrorMessageBuilder(path).WithLocation("op regel 1").Build(IOResources.Error_File_empty);
+                var expectedMessage = new FileReaderErrorMessageBuilder(path).WithLocation("op regel 1").Build(UtilsResources.Error_File_empty);
                 Assert.AreEqual(expectedMessage, exception.Message);
             }
         }
@@ -303,7 +302,7 @@
 
                 // Assert
                 var exception = Assert.Throws<CriticalFileReadException>(call);
-                var expectedMessage = new FileReaderErrorMessageBuilder(path).Build(IOResources.Error_File_does_not_exist);
+                var expectedMessage = new FileReaderErrorMessageBuilder(path).Build(UtilsResources.Error_File_does_not_exist);
                 Assert.AreEqual(expectedMessage, exception.Message);
                 Assert.IsInstanceOf<FileNotFoundException>(exception.InnerException);
             }
@@ -325,7 +324,7 @@
 
                 // Assert
                 var exception = Assert.Throws<CriticalFileReadException>(call);
-                var expectedMessage = new FileReaderErrorMessageBuilder(path).Build(IOResources.Error_Directory_missing);
+                var expectedMessage = new FileReaderErrorMessageBuilder(path).Build(UtilsResources.Error_Directory_missing);
                 Assert.AreEqual(expectedMessage, exception.Message);
                 Assert.IsInstanceOf<DirectoryNotFoundException>(exception.InnerException);
             }
@@ -347,7 +346,7 @@
 
                 // Assert
                 var exception = Assert.Throws<CriticalFileReadException>(call);
-                var expectedMessage = new FileReaderErrorMessageBuilder(path).WithLocation("op regel 1").Build(IOResources.Error_File_empty);
+                var expectedMessage = new FileReaderErrorMessageBuilder(path).WithLocation("op regel 1").Build(UtilsResources.Error_File_empty);
                 Assert.AreEqual(expectedMessage, exception.Message);
             }
         }
Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Ringtoets.Piping.IO.Test.csproj
===================================================================
diff -u -r443423bba9710843153b9afda01bbee47cd1b298 -r654d3a712eedbdeea718dc0448c5544f09e053cd
--- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Ringtoets.Piping.IO.Test.csproj	(.../Ringtoets.Piping.IO.Test.csproj)	(revision 443423bba9710843153b9afda01bbee47cd1b298)
+++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Ringtoets.Piping.IO.Test.csproj	(.../Ringtoets.Piping.IO.Test.csproj)	(revision 654d3a712eedbdeea718dc0448c5544f09e053cd)
@@ -60,7 +60,6 @@
     <Reference Include="System.Xml.Linq" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Builders\FileReaderErrorMessageBuilderTest.cs" />
     <Compile Include="Builders\SoilLayer1DTest.cs" />
     <Compile Include="Builders\SoilLayer2DConversionExceptionTest.cs" />
     <Compile Include="Builders\SoilLayer2DTest.cs" />
@@ -70,7 +69,6 @@
     <Compile Include="Exceptions\CriticalFileReadExceptionTest.cs" />
     <Compile Include="Exceptions\LineParseExceptionTest.cs" />
     <Compile Include="Exceptions\PipingSoilProfileReadExceptionTest.cs" />
-    <Compile Include="FileUtilsTest.cs" />
     <Compile Include="SoilProfile\CriticalProfilePropertiesTest.cs" />
     <Compile Include="SoilProfile\SoilLayer2DReaderTest.cs" />
     <Compile Include="SoilProfile\PipingSoilProfileReaderTest.cs" />
@@ -82,6 +80,10 @@
     <Compile Include="TestHelpers\StringGeometryHelper.cs" />
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Utils\Core.Common.Utils.csproj">
+      <Project>{f49bd8b2-332a-4c91-a196-8cce0a2c7d98}</Project>
+      <Name>Core.Common.Utils</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\..\..\Core\Common\test\Core.Common.TestUtil\Core.Common.TestUtil.csproj">
       <Project>{d749ee4c-ce50-4c17-bf01-9a953028c126}</Project>
       <Name>Core.Common.TestUtil</Name>
Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/SoilProfile/CriticalProfilePropertiesTest.cs
===================================================================
diff -u -rd082f5444ccd9571f4fabb4c47f1082fa5ece21e -r654d3a712eedbdeea718dc0448c5544f09e053cd
--- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/SoilProfile/CriticalProfilePropertiesTest.cs	(.../CriticalProfilePropertiesTest.cs)	(revision d082f5444ccd9571f4fabb4c47f1082fa5ece21e)
+++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/SoilProfile/CriticalProfilePropertiesTest.cs	(.../CriticalProfilePropertiesTest.cs)	(revision 654d3a712eedbdeea718dc0448c5544f09e053cd)
@@ -1,8 +1,7 @@
 using System;
+using Core.Common.Utils.Builders;
 using NUnit.Framework;
 using Rhino.Mocks;
-
-using Ringtoets.Piping.IO.Builders;
 using Ringtoets.Piping.IO.Exceptions;
 using Ringtoets.Piping.IO.Properties;
 using Ringtoets.Piping.IO.SoilProfile;
Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/SoilProfile/PipingSoilProfileReaderTest.cs
===================================================================
diff -u -r7612d0b14bca5e0686b654dc0ffb96fcc0ff0a2b -r654d3a712eedbdeea718dc0448c5544f09e053cd
--- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/SoilProfile/PipingSoilProfileReaderTest.cs	(.../PipingSoilProfileReaderTest.cs)	(revision 7612d0b14bca5e0686b654dc0ffb96fcc0ff0a2b)
+++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/SoilProfile/PipingSoilProfileReaderTest.cs	(.../PipingSoilProfileReaderTest.cs)	(revision 654d3a712eedbdeea718dc0448c5544f09e053cd)
@@ -4,13 +4,14 @@
 using System.IO;
 using System.Linq;
 using Core.Common.TestUtil;
+using Core.Common.Utils.Builders;
 using NUnit.Framework;
 using Ringtoets.Piping.Data;
-using Ringtoets.Piping.IO.Builders;
 using Ringtoets.Piping.IO.Exceptions;
 using Ringtoets.Piping.IO.Properties;
 using Ringtoets.Piping.IO.SoilProfile;
 using Ringtoets.Piping.IO.Test.TestHelpers;
+using UtilsResources = Core.Common.Utils.Properties.Resources;
 
 namespace Ringtoets.Piping.IO.Test.SoilProfile
 {
@@ -29,7 +30,7 @@
 
             // Assert
             var exception = Assert.Throws<CriticalFileReadException>(test);
-            var expectedMessage = new FileReaderErrorMessageBuilder(testFile).Build(Resources.Error_File_does_not_exist);
+            var expectedMessage = new FileReaderErrorMessageBuilder(testFile).Build(UtilsResources.Error_File_does_not_exist);
             Assert.AreEqual(expectedMessage, exception.Message);
         }
 
@@ -44,7 +45,7 @@
             // Assert
             var exception = Assert.Throws<CriticalFileReadException>(test);
             var expectedMessage = String.Format("Fout bij het lezen van bestand '{0}': {1}",
-                                                fileName, Resources.Error_Path_must_be_specified);
+                                                fileName, UtilsResources.Error_Path_must_be_specified);
             Assert.AreEqual(expectedMessage, exception.Message);
         }
 
Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/SoilProfile/SoilProfile1DReaderTest.cs
===================================================================
diff -u -rd082f5444ccd9571f4fabb4c47f1082fa5ece21e -r654d3a712eedbdeea718dc0448c5544f09e053cd
--- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/SoilProfile/SoilProfile1DReaderTest.cs	(.../SoilProfile1DReaderTest.cs)	(revision d082f5444ccd9571f4fabb4c47f1082fa5ece21e)
+++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/SoilProfile/SoilProfile1DReaderTest.cs	(.../SoilProfile1DReaderTest.cs)	(revision 654d3a712eedbdeea718dc0448c5544f09e053cd)
@@ -1,9 +1,8 @@
 using System;
 using System.Linq;
+using Core.Common.Utils.Builders;
 using NUnit.Framework;
 using Rhino.Mocks;
-
-using Ringtoets.Piping.IO.Builders;
 using Ringtoets.Piping.IO.Exceptions;
 using Ringtoets.Piping.IO.SoilProfile;
 
Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/SoilProfile/SoilProfile2DReaderTest.cs
===================================================================
diff -u -rd082f5444ccd9571f4fabb4c47f1082fa5ece21e -r654d3a712eedbdeea718dc0448c5544f09e053cd
--- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/SoilProfile/SoilProfile2DReaderTest.cs	(.../SoilProfile2DReaderTest.cs)	(revision d082f5444ccd9571f4fabb4c47f1082fa5ece21e)
+++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/SoilProfile/SoilProfile2DReaderTest.cs	(.../SoilProfile2DReaderTest.cs)	(revision 654d3a712eedbdeea718dc0448c5544f09e053cd)
@@ -1,9 +1,8 @@
 using System;
 using System.Linq;
+using Core.Common.Utils.Builders;
 using NUnit.Framework;
 using Rhino.Mocks;
-
-using Ringtoets.Piping.IO.Builders;
 using Ringtoets.Piping.IO.Exceptions;
 using Ringtoets.Piping.IO.SoilProfile;
 using Ringtoets.Piping.IO.Test.TestHelpers;
Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/FileImporter/PipingSoilProfilesImporterTest.cs
===================================================================
diff -u -rd6e6eadf4a2521df75b6d371bacbb181a43058a3 -r654d3a712eedbdeea718dc0448c5544f09e053cd
--- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/FileImporter/PipingSoilProfilesImporterTest.cs	(.../PipingSoilProfilesImporterTest.cs)	(revision d6e6eadf4a2521df75b6d371bacbb181a43058a3)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/FileImporter/PipingSoilProfilesImporterTest.cs	(.../PipingSoilProfilesImporterTest.cs)	(revision 654d3a712eedbdeea718dc0448c5544f09e053cd)
@@ -5,14 +5,11 @@
 using Core.Common.Base;
 using Core.Common.Base.IO;
 using Core.Common.TestUtil;
+using Core.Common.Utils.Builders;
 using NUnit.Framework;
-
 using Rhino.Mocks;
-
 using Ringtoets.Piping.Data;
-using Ringtoets.Piping.IO.Builders;
 using Ringtoets.Piping.Plugin.FileImporter;
-
 using PipingFormsResources = Ringtoets.Piping.Forms.Properties.Resources;
 using RingtoetsFormsResources = Ringtoets.Common.Forms.Properties.Resources;
 using ApplicationResources = Ringtoets.Piping.Plugin.Properties.Resources;
@@ -37,7 +34,7 @@
         {
             // Prepare
             var expectedFileFilter = String.Format("{0} {1} (*.soil)|*.soil",
-                PipingFormsResources.PipingSoilProfilesCollection_DisplayName, ApplicationResources.Soil_file_name);
+                                                   PipingFormsResources.PipingSoilProfilesCollection_DisplayName, ApplicationResources.Soil_file_name);
 
             // Call
             var importer = new PipingSoilProfilesImporter();
@@ -261,7 +258,7 @@
             TestHelper.AssertLogMessageIsGenerated(call, expectedLogMessage, 1);
             Assert.IsFalse(importResult);
             CollectionAssert.IsEmpty(observableSoilProfileList,
-                "No items should be added to collection when import is aborted.");
+                                     "No items should be added to collection when import is aborted.");
             Assert.AreEqual(1, progress);
 
             mocks.VerifyAll(); // Expect no calls on 'observer'
Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/FileImporter/PipingSurfaceLineCsvImporterTest.cs
===================================================================
diff -u -r7612d0b14bca5e0686b654dc0ffb96fcc0ff0a2b -r654d3a712eedbdeea718dc0448c5544f09e053cd
--- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/FileImporter/PipingSurfaceLineCsvImporterTest.cs	(.../PipingSurfaceLineCsvImporterTest.cs)	(revision 7612d0b14bca5e0686b654dc0ffb96fcc0ff0a2b)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/FileImporter/PipingSurfaceLineCsvImporterTest.cs	(.../PipingSurfaceLineCsvImporterTest.cs)	(revision 654d3a712eedbdeea718dc0448c5544f09e053cd)
@@ -5,18 +5,16 @@
 using Core.Common.Base;
 using Core.Common.Base.IO;
 using Core.Common.TestUtil;
+using Core.Common.Utils.Builders;
 using NUnit.Framework;
-
 using Rhino.Mocks;
-
 using Ringtoets.Piping.Data;
-using Ringtoets.Piping.IO.Builders;
 using Ringtoets.Piping.Plugin.FileImporter;
-
 using PipingFormsResources = Ringtoets.Piping.Forms.Properties.Resources;
 using PipingIOResources = Ringtoets.Piping.IO.Properties.Resources;
 using RingtoetsFormsResources = Ringtoets.Common.Forms.Properties.Resources;
 using ApplicationResources = Ringtoets.Piping.Plugin.Properties.Resources;
+using UtilsResources = Core.Common.Utils.Properties.Resources;
 
 namespace Ringtoets.Piping.Plugin.Test.FileImporter
 {
@@ -38,8 +36,8 @@
             Assert.AreEqual(16, importer.Image.Width);
             Assert.AreEqual(16, importer.Image.Height);
             Assert.AreEqual(typeof(ICollection<RingtoetsPipingSurfaceLine>), importer.SupportedItemType);
-            var expectedFileFilter = String.Format("{0} {1} (*.csv)|*.csv", 
-                PipingFormsResources.PipingSurfaceLinesCollection_DisplayName, ApplicationResources.Csv_file_name);
+            var expectedFileFilter = String.Format("{0} {1} (*.csv)|*.csv",
+                                                   PipingFormsResources.PipingSurfaceLinesCollection_DisplayName, ApplicationResources.Csv_file_name);
             Assert.AreEqual(expectedFileFilter, importer.FileFilter);
             Assert.IsNull(importer.ProgressChanged);
         }
@@ -68,7 +66,7 @@
                 {
                     Assert.AreEqual(String.Format(ApplicationResources.PipingSurfaceLinesCsvImporter_Read_PipingSurfaceLines_0_, twovalidsurfacelinesCsv), currentStepName);
                 }
-                else if (callCount == expectedNumberOfSurfaceLines+1)
+                else if (callCount == expectedNumberOfSurfaceLines + 1)
                 {
                     Assert.AreEqual(ApplicationResources.PipingSurfaceLinesCsvImporter_Adding_imported_data_to_model, currentStepName);
                 }
@@ -184,7 +182,7 @@
 
             // Call
             Action call = () => importResult = importer.Import(observableSurfaceLinesList, validFilePath);
-            
+
             // Assert
             TestHelper.AssertLogMessageIsGenerated(call, ApplicationResources.PipingSurfaceLinesCsvImporter_Import_Import_cancelled, 1);
             Assert.IsFalse(importResult);
@@ -250,14 +248,14 @@
             Action call = () => importResult = importer.Import(observableSurfaceLinesList, corruptPath);
 
             // Assert
-            var internalErrorMessage = new FileReaderErrorMessageBuilder(corruptPath).Build(String.Format(PipingIOResources.Error_Path_cannot_contain_Characters_0_,
-                                                     String.Join(", ", Path.GetInvalidFileNameChars())));
+            var internalErrorMessage = new FileReaderErrorMessageBuilder(corruptPath).Build(String.Format(UtilsResources.Error_Path_cannot_contain_Characters_0_,
+                                                                                                          String.Join(", ", Path.GetInvalidFileNameChars())));
             var expectedLogMessage = string.Format(ApplicationResources.PipingSurfaceLinesCsvImporter_CriticalErrorMessage_0_File_Skipped,
                                                    internalErrorMessage);
             TestHelper.AssertLogMessageIsGenerated(call, expectedLogMessage, 1);
             Assert.IsFalse(importResult);
             CollectionAssert.IsEmpty(observableSurfaceLinesList,
-                "No items should be added to collection when import is aborted.");
+                                     "No items should be added to collection when import is aborted.");
             mocks.VerifyAll(); // Expect no calls on 'observer'
         }
 
@@ -282,13 +280,13 @@
             Action call = () => importResult = importer.Import(observableSurfaceLinesList, corruptPath);
 
             // Assert
-            var internalErrorMessage = new FileReaderErrorMessageBuilder(corruptPath).Build(PipingIOResources.Error_File_does_not_exist);
+            var internalErrorMessage = new FileReaderErrorMessageBuilder(corruptPath).Build(UtilsResources.Error_File_does_not_exist);
             var expectedLogMessage = string.Format(ApplicationResources.PipingSurfaceLinesCsvImporter_CriticalErrorMessage_0_File_Skipped,
                                                    internalErrorMessage);
             TestHelper.AssertLogMessageIsGenerated(call, expectedLogMessage, 1);
             Assert.IsFalse(importResult);
             CollectionAssert.IsEmpty(observableSurfaceLinesList,
-                "No items should be added to collection when import is aborted.");
+                                     "No items should be added to collection when import is aborted.");
             mocks.VerifyAll(); // Expect no calls on 'observer'
         }
 
@@ -315,13 +313,13 @@
             // Assert
             var internalErrorMessage = new FileReaderErrorMessageBuilder(corruptPath)
                 .WithLocation("op regel 1")
-                .Build(PipingIOResources.Error_File_empty);
+                .Build(UtilsResources.Error_File_empty);
             var expectedLogMessage = string.Format(ApplicationResources.PipingSurfaceLinesCsvImporter_CriticalErrorMessage_0_File_Skipped,
                                                    internalErrorMessage);
             TestHelper.AssertLogMessageIsGenerated(call, expectedLogMessage, 1);
             Assert.IsFalse(importResult);
             CollectionAssert.IsEmpty(observableSurfaceLinesList,
-                "No items should be added to collection when import is aborted.");
+                                     "No items should be added to collection when import is aborted.");
             mocks.VerifyAll(); // Expect no calls on 'observer'
         }
 
@@ -354,7 +352,7 @@
             TestHelper.AssertLogMessageIsGenerated(call, expectedLogMessage, 1);
             Assert.IsFalse(importResult);
             CollectionAssert.IsEmpty(observableSurfaceLinesList,
-                "No items should be added to collection when import is aborted.");
+                                     "No items should be added to collection when import is aborted.");
             mocks.VerifyAll(); // Expect no calls on 'observer'
         }
 
@@ -388,7 +386,7 @@
                 Action call = () => importResult = importer.Import(observableSurfaceLinesList, copyTargetPath);
 
                 // Assert
-                var internalErrorMessage = new FileReaderErrorMessageBuilder(copyTargetPath).Build(PipingIOResources.Error_File_does_not_exist);
+                var internalErrorMessage = new FileReaderErrorMessageBuilder(copyTargetPath).Build(UtilsResources.Error_File_does_not_exist);
                 var expectedLogMessage = string.Format(ApplicationResources.PipingSurfaceLinesCsvImporter_CriticalErrorMessage_0_File_Skipped,
                                                        internalErrorMessage);
                 TestHelper.AssertLogMessageIsGenerated(call, expectedLogMessage, 1);
@@ -420,10 +418,7 @@
 
             var importer = new PipingSurfaceLinesCsvImporter();
             int progressCallCount = 0;
-            importer.ProgressChanged += (name, step, steps) =>
-            {
-                progressCallCount++;
-            };
+            importer.ProgressChanged += (name, step, steps) => { progressCallCount++; };
 
             var observableSurfaceLinesList = new ObservableList<RingtoetsPipingSurfaceLine>();
             observableSurfaceLinesList.Attach(observer);
@@ -444,12 +439,12 @@
             Assert.IsTrue(importResult);
 
             Assert.AreEqual(2, observableSurfaceLinesList.Count,
-                "Ensure only the two valid surfacelines have been imported.");
+                            "Ensure only the two valid surfacelines have been imported.");
             Assert.AreEqual(1, observableSurfaceLinesList.Count(sl => sl.Name == "Rotterdam1"));
             Assert.AreEqual(1, observableSurfaceLinesList.Count(sl => sl.Name == "ArtifcialLocal"));
 
             Assert.AreEqual(5, progressCallCount,
-                "Expect 1 call for each surfaceline (3 in total) +1 for 0/N progress, and 1 for putting data in model.");
+                            "Expect 1 call for each surfaceline (3 in total) +1 for 0/N progress, and 1 for putting data in model.");
             mocks.VerifyAll();
         }
 
Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/Ringtoets.Piping.Plugin.Test.csproj
===================================================================
diff -u -ra5cef96df6e2e617d51e71210cb190ebce097533 -r654d3a712eedbdeea718dc0448c5544f09e053cd
--- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/Ringtoets.Piping.Plugin.Test.csproj	(.../Ringtoets.Piping.Plugin.Test.csproj)	(revision a5cef96df6e2e617d51e71210cb190ebce097533)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/Ringtoets.Piping.Plugin.Test.csproj	(.../Ringtoets.Piping.Plugin.Test.csproj)	(revision 654d3a712eedbdeea718dc0448c5544f09e053cd)
@@ -88,6 +88,10 @@
       <Project>{30e4c2ae-719e-4d70-9fa9-668a9767fbfa}</Project>
       <Name>Core.Common.Gui</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Utils\Core.Common.Utils.csproj">
+      <Project>{f49bd8b2-332a-4c91-a196-8cce0a2c7d98}</Project>
+      <Name>Core.Common.Utils</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\..\..\Core\Common\test\Core.Common.TestUtil\Core.Common.TestUtil.csproj">
       <Project>{d749ee4c-ce50-4c17-bf01-9a953028c126}</Project>
       <Name>Core.Common.TestUtil</Name>