Index: Core/Common/src/Core.Common.IO/Readers/IDataReaderExtensions.cs
===================================================================
diff -u -r1ac796985b56d9e81af2e78e9f7a1e4b259a91ba -r8aed37b83aa4d0b9a0932551f8727ceca83e5cc4
--- Core/Common/src/Core.Common.IO/Readers/IDataReaderExtensions.cs	(.../IDataReaderExtensions.cs)	(revision 1ac796985b56d9e81af2e78e9f7a1e4b259a91ba)
+++ Core/Common/src/Core.Common.IO/Readers/IDataReaderExtensions.cs	(.../IDataReaderExtensions.cs)	(revision 8aed37b83aa4d0b9a0932551f8727ceca83e5cc4)
@@ -32,13 +32,13 @@
         /// Reads a value at column <paramref name="columnName"/> from the database.
         /// </summary>
         /// <typeparam name="T">The expected type of value in the column with name <paramref name="columnName"/>.</typeparam>
-        /// <param name="dataReader">The data reader to read a column of a certain type from.</param>
+        /// <param name="dataReader">The data reader from which to read a column of a certain type.</param>
         /// <param name="columnName">The name of the column to read from.</param>
         /// <returns>The read value from the column with name <paramref name="columnName"/>.</returns>
         /// <exception cref="ArgumentException">Thrown when <paramref name="columnName"/> is not present in the read
         /// data row.</exception>
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="dataReader"/> or 
-        /// <paramref name="columnName"/> is null.</exception>
+        /// <paramref name="columnName"/> is <c>null</c>.</exception>
         /// <exception cref="ConversionException">Thrown when the value in the column could not be converted
         /// to type <typeparamref name="T"/>.</exception>
         public static T Read<T>(this IDataReader dataReader, string columnName)
@@ -61,7 +61,7 @@
             }
             catch (IndexOutOfRangeException)
             {
-                throw new ArgumentException(string.Format("Column '{0}' not defined for data row.", columnName), "columnName");    
+                throw new ArgumentException(string.Format("Column '{0}' not defined for data row.", columnName), "columnName");
             }
 
             try
@@ -72,23 +72,23 @@
             {
                 throw new ConversionException(
                     string.Format(CultureInfo.CurrentCulture, "Value read from data reader ('{0}') could not be cast to desired type {1}.",
-                    value, 
-                    conversionType));
+                                  value,
+                                  conversionType));
             }
             catch (FormatException)
             {
                 throw new ConversionException(
                     string.Format(CultureInfo.CurrentCulture, "Value read from data reader ('{0}') is an incorrect format to transform to type {1}.",
-                    value,
-                    conversionType));
+                                  value,
+                                  conversionType));
             }
             catch (OverflowException)
             {
                 throw new ConversionException(
                     string.Format(CultureInfo.CurrentCulture, "Value read from data reader ('{0}') was too large to convert to type {1}.",
-                    value,
-                    conversionType));
+                                  value,
+                                  conversionType));
             }
-        } 
+        }
     }
 }
\ No newline at end of file
Index: Core/Common/src/Core.Common.IO/Readers/SqLiteDatabaseReaderBase.cs
===================================================================
diff -u -rd73c509c93f18a87da76086c871eca2a2c903e12 -r8aed37b83aa4d0b9a0932551f8727ceca83e5cc4
--- Core/Common/src/Core.Common.IO/Readers/SqLiteDatabaseReaderBase.cs	(.../SqLiteDatabaseReaderBase.cs)	(revision d73c509c93f18a87da76086c871eca2a2c903e12)
+++ Core/Common/src/Core.Common.IO/Readers/SqLiteDatabaseReaderBase.cs	(.../SqLiteDatabaseReaderBase.cs)	(revision 8aed37b83aa4d0b9a0932551f8727ceca83e5cc4)
@@ -93,7 +93,7 @@
         /// <summary>
         /// Moves to and reads the next resultset in multiple row-returning SQL command. 
         /// </summary>
-        /// <param name="sqliteDataReader">The <see cref="SQLiteDataReader"/> to process.</param>
+        /// <param name="sqliteDataReader">The <see cref="IDataReader"/> to process.</param>
         /// <returns><c>True</c> if the command was successful and a new resultset is available, <c>false</c> otherwise.</returns>
         protected static bool MoveNext(IDataReader sqliteDataReader)
         {
@@ -105,7 +105,7 @@
         /// </summary>
         /// <param name="queryString">The query to execute.</param>
         /// <param name="parameters">Parameters the <paramref name="queryString"/> is dependend on.</param>
-        /// <returns>A new instance of <see cref="SQLiteDataReader"/>.</returns>
+        /// <returns>A new instance of <see cref="IDataReader"/>.</returns>
         /// <exception cref="SQLiteException">The execution of <paramref name="queryString"/> failed.</exception>
         protected IDataReader CreateDataReader(string queryString, params SQLiteParameter[] parameters)
         {
Index: Core/Components/src/Core.Components.Gis.IO/Readers/ShapeFileReaderBase.cs
===================================================================
diff -u -rf824252815cb5424b38cc755c718d4fd2137c4f5 -r8aed37b83aa4d0b9a0932551f8727ceca83e5cc4
--- Core/Components/src/Core.Components.Gis.IO/Readers/ShapeFileReaderBase.cs	(.../ShapeFileReaderBase.cs)	(revision f824252815cb5424b38cc755c718d4fd2137c4f5)
+++ Core/Components/src/Core.Components.Gis.IO/Readers/ShapeFileReaderBase.cs	(.../ShapeFileReaderBase.cs)	(revision 8aed37b83aa4d0b9a0932551f8727ceca83e5cc4)
@@ -126,16 +126,16 @@
 
             for (int i = 0; i < columns.Count; i++)
             {
-                var dataRowValue = dataRow[i];
+                object dataRowValue = dataRow[i];
 
                 object newValue = null;
-                var column = columns[i];
+                Field column = columns[i];
 
                 if (!(dataRowValue is DBNull))
                 {
                     if (column.TypeCharacter != 'C' && dataRowValue is string)
                     {
-                        var nullValue = string.Join(string.Empty, Enumerable.Repeat('*', column.Length));
+                        string nullValue = string.Join(string.Empty, Enumerable.Repeat('*', column.Length));
                         if (!string.Equals(dataRowValue, nullValue))
                         {
                             newValue = dataRowValue;
Index: Ringtoets/Common/src/Ringtoets.Common.IO/FailureMechanismSectionReader.cs
===================================================================
diff -u -r283332160a6686b6426a74a672176b9e501ec1c8 -r8aed37b83aa4d0b9a0932551f8727ceca83e5cc4
--- Ringtoets/Common/src/Ringtoets.Common.IO/FailureMechanismSectionReader.cs	(.../FailureMechanismSectionReader.cs)	(revision 283332160a6686b6426a74a672176b9e501ec1c8)
+++ Ringtoets/Common/src/Ringtoets.Common.IO/FailureMechanismSectionReader.cs	(.../FailureMechanismSectionReader.cs)	(revision 8aed37b83aa4d0b9a0932551f8727ceca83e5cc4)
@@ -144,7 +144,7 @@
 
             if (string.IsNullOrWhiteSpace(sectionName))
             {
-                throw CreateCriticalFileReadException("Voor één van de vakken is geen naam opgegeven.");
+                throw CreateCriticalFileReadException(RingtoetsCommonIOResources.FailureMechanismSectionReader_File_has_section_without_sectionName);
             }
 
             return sectionName;
Index: Ringtoets/Common/src/Ringtoets.Common.IO/Properties/Resources.Designer.cs
===================================================================
diff -u -r4b93743129a2c7335995686ba8ccbee63b476446 -r8aed37b83aa4d0b9a0932551f8727ceca83e5cc4
--- Ringtoets/Common/src/Ringtoets.Common.IO/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 4b93743129a2c7335995686ba8ccbee63b476446)
+++ Ringtoets/Common/src/Ringtoets.Common.IO/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 8aed37b83aa4d0b9a0932551f8727ceca83e5cc4)
@@ -22,7 +22,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
+//     Runtime Version:4.0.30319.34209
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -415,6 +415,15 @@
         }
         
         /// <summary>
+        ///   Looks up a localized string similar to Voor één van de vakken is geen naam opgegeven..
+        /// </summary>
+        public static string FailureMechanismSectionReader_File_has_section_without_sectionName {
+            get {
+                return ResourceManager.GetString("FailureMechanismSectionReader_File_has_section_without_sectionName", resourceCulture);
+            }
+        }
+        
+        /// <summary>
         ///   Looks up a localized string similar to Het bestand bevat één of meerdere multi-polylijnen. Multi-polylijnen worden niet ondersteund..
         /// </summary>
         public static string FailureMechanismSectionReader_File_has_unsupported_multiPolyline {
@@ -977,14 +986,14 @@
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to BEGIN TRANSACTION;
-        ///CREATE TABLE &quot;TimeIntegrationSettings&quot; (
-        ///                &quot;LocationID&quot; INTEGER NOT NULL,
-        ///                &quot;CalculationTypeID&quot; INTEGER NOT NULL,
-        ///                &quot;TimeIntegrationSchemeID&quot; INTEGER NOT NULL,
-        ///	CONSTRAINT timeintegrationsettings_pk PRIMARY KEY (&quot;LocationID&quot;, &quot;CalculationTypeID&quot;),
-        ///	CONSTRAINT calculationtypes_timeintegrationsettings_fk FOREIGN KEY (&quot;CalculationTypeID&quot;) REFERENCES CalculationTypes (&quot;CalculationTypeID&quot;) ON DELETE NO ACTION ON UPDATE NO ACTION
-        ///);
+        ///   Looks up a localized string similar to BEGIN TRANSACTION;
+        ///CREATE TABLE &quot;TimeIntegrationSettings&quot; (
+        ///                &quot;LocationID&quot; INTEGER NOT NULL,
+        ///                &quot;CalculationTypeID&quot; INTEGER NOT NULL,
+        ///                &quot;TimeIntegrationSchemeID&quot; INTEGER NOT NULL,
+        ///	CONSTRAINT timeintegrationsettings_pk PRIMARY KEY (&quot;LocationID&quot;, &quot;CalculationTypeID&quot;),
+        ///	CONSTRAINT calculationtypes_timeintegrationsettings_fk FOREIGN KEY (&quot;CalculationTypeID&quot;) REFERENCES CalculationTypes (&quot;CalculationTypeID&quot;) ON DELETE NO ACTION ON UPDATE NO ACTION
+        ///);
         ///CREATE TABLE &quot;Numeri [rest of string was truncated]&quot;;.
         /// </summary>
         public static string settings_schema {
Index: Ringtoets/Common/src/Ringtoets.Common.IO/Properties/Resources.resx
===================================================================
diff -u -r64eede81657b51fb755944fd3939ceefb839e591 -r8aed37b83aa4d0b9a0932551f8727ceca83e5cc4
--- Ringtoets/Common/src/Ringtoets.Common.IO/Properties/Resources.resx	(.../Resources.resx)	(revision 64eede81657b51fb755944fd3939ceefb839e591)
+++ Ringtoets/Common/src/Ringtoets.Common.IO/Properties/Resources.resx	(.../Resources.resx)	(revision 8aed37b83aa4d0b9a0932551f8727ceca83e5cc4)
@@ -494,4 +494,7 @@
   <data name="HydraRingSettingsDatabaseReader_ValidateSchema_Hydraulic_calculation_settings_database_has_invalid_schema" xml:space="preserve">
     <value>De rekeninstellingen database heeft niet het juiste schema.</value>
   </data>
+  <data name="FailureMechanismSectionReader_File_has_section_without_sectionName" xml:space="preserve">
+    <value>Voor één van de vakken is geen naam opgegeven.</value>
+  </data>
 </root>
\ No newline at end of file
Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/FileImporters/FailureMechanismSectionsImporterTest.cs
===================================================================
diff -u -r283332160a6686b6426a74a672176b9e501ec1c8 -r8aed37b83aa4d0b9a0932551f8727ceca83e5cc4
--- Ringtoets/Common/test/Ringtoets.Common.IO.Test/FileImporters/FailureMechanismSectionsImporterTest.cs	(.../FailureMechanismSectionsImporterTest.cs)	(revision 283332160a6686b6426a74a672176b9e501ec1c8)
+++ Ringtoets/Common/test/Ringtoets.Common.IO.Test/FileImporters/FailureMechanismSectionsImporterTest.cs	(.../FailureMechanismSectionsImporterTest.cs)	(revision 8aed37b83aa4d0b9a0932551f8727ceca83e5cc4)
@@ -470,7 +470,7 @@
         }
 
         [Test]
-        public void Import_MissingNameValue_ShouldReturn()
+        public void Import_MissingNameValue_CancelImportWithErrorMessage()
         {
             // Setup
             var sectionsFilePath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Common.IO,