Index: Ringtoets/Piping/src/Ringtoets.Piping.IO/PipingSoilProfileReader.cs
===================================================================
diff -u -r6692dc3480971fe1c017aef633382c40eb37056f -rf67ccd7b88da303d2ac322bbd489f2c6ea287e1c
--- Ringtoets/Piping/src/Ringtoets.Piping.IO/PipingSoilProfileReader.cs	(.../PipingSoilProfileReader.cs)	(revision 6692dc3480971fe1c017aef633382c40eb37056f)
+++ Ringtoets/Piping/src/Ringtoets.Piping.IO/PipingSoilProfileReader.cs	(.../PipingSoilProfileReader.cs)	(revision f67ccd7b88da303d2ac322bbd489f2c6ea287e1c)
@@ -82,7 +82,7 @@
                 return null;
             }
 
-            var dimensionValue = Read<long>(dimensionColumn);
+            var dimensionValue = TryRead<long>(dimensionColumn);
             return dimensionValue == 1 ? ReadPipingProfile1D() : ReadPipingProfile2D();
         }
 
@@ -106,9 +106,9 @@
 
         private PipingSoilProfile ReadPipingProfile1D()
         {
-            var profileName = Read<string>(profileNameColumn);
-            var layerCount = Read<long>(layerCountColumn);
-            var bottom = Read<double>(bottomColumn);
+            var profileName = TryRead<string>(profileNameColumn);
+            var layerCount = TryRead<long>(layerCountColumn);
+            var bottom = TryRead<double>(bottomColumn);
 
             var soilProfileBuilder = new SoilProfileBuilder1D(profileName, bottom);
 
@@ -128,9 +128,9 @@
         /// <exception cref="PipingSoilProfileReadException">Thrown when a layer's geometry could not be parsed as XML.</exception>
         private PipingSoilProfile ReadPipingProfile2D()
         {
-            var profileName = Read<string>(profileNameColumn);
-            var layerCount = Read<long>(layerCountColumn);
-            var intersectionX = Read<double>(intersectionXColumn);
+            var profileName = TryRead<string>(profileNameColumn);
+            var layerCount = TryRead<long>(layerCountColumn);
+            var intersectionX = TryRead<double>(intersectionXColumn);
 
             var soilProfileBuilder = new SoilProfileBuilder2D(profileName, intersectionX);
 
@@ -145,10 +145,7 @@
                     var exception = new PipingSoilProfileReadException(
                         string.Format(Resources.PipingSoilProfileReader_CouldNotParseGeometryOfLayer_0_InProfile_1_, i, profileName), e);
 
-                    while (i++ <= layerCount)
-                    {
-                        MoveNext();
-                    }
+                    SkipRecords((int)layerCount + 1 - i);
 
                     throw exception;
                 }
@@ -158,36 +155,47 @@
             return soilProfileBuilder.Build();
         }
 
+        private void SkipRecords(int count)
+        {
+            for(int i = 0; i < count; i++)
+            {
+                MoveNext();
+            }
+        }
+
         private void SetReaderToFirstRecord()
         {
             InitializeDataReader();
             MoveNext();
         }
 
-        private void TryRead<T>(string columnName, out T value)
-        {
-            try
-            {
-                value = (T) dataReader[columnName];
-            }
-            catch (InvalidCastException)
-            {
-                value = default(T);
-            }
-        }
-
         /// <summary>
         /// 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="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="InvalidCastException">Thrown when the value in the column was not of type <typeparamref name="T"/>.</exception>
-        private T Read<T>(string columnName)
+        private T TryRead<T>(string columnName)
         {
-            return (T) dataReader[columnName];
-        }
+            var dbValue = dataReader[columnName];
+            var isNullable = typeof(T).IsGenericType && typeof(Nullable<>).IsAssignableFrom(typeof(T).GetGenericTypeDefinition());
 
+            if (isNullable && dbValue == DBNull.Value)
+            {
+                return default(T);
+            }
+
+            try
+            {
+                return (T)dbValue;
+            }
+            catch (InvalidCastException)
+            {
+                throw new CriticalFileReadException(Resources.PipingSoilProfileReader_Invalid_value_on_column);
+            }
+        }
+        
         private void OpenConnection(string dbFile)
         {
             var connectionStringBuilder = new SQLiteConnectionStringBuilder
@@ -216,17 +224,12 @@
 
         private PipingSoilLayer ReadPipingSoilLayer()
         {
-            double? isAquiferValue;
-            double? belowPhreaticLevelValue;
-            double? abovePhreaticLevelValue;
-            double? dryUnitWeightValue;
+            var topValue = TryRead<double>(topColumn);
+            var isAquiferValue = TryRead<double?>(isAquiferColumn);
+            var belowPhreaticLevelValue = TryRead<double?>(belowPhreaticLevelColumn);
+            var abovePhreaticLevelValue = TryRead<double?>(abovePhreaticLevelColumn);
+            var dryUnitWeightValue = TryRead<double?>(dryUnitWeightColumn);
 
-            var topValue = Read<double>(topColumn);
-            TryRead(isAquiferColumn, out isAquiferValue);
-            TryRead(belowPhreaticLevelColumn, out belowPhreaticLevelValue);
-            TryRead(abovePhreaticLevelColumn, out abovePhreaticLevelValue);
-            TryRead(dryUnitWeightColumn, out dryUnitWeightValue);
-
             var pipingSoilLayer = new PipingSoilLayer(topValue)
             {
                 IsAquifer = isAquiferValue,
@@ -244,17 +247,12 @@
         /// <exception cref="InvalidCastException">Thrown when a column did not contain a value of the expected type.</exception>
         private SoilLayer2D ReadPiping2DSoilLayer()
         {
-            double? isAquiferValue;
-            double? belowPhreaticLevelValue;
-            double? abovePhreaticLevelValue;
-            double? dryUnitWeightValue;
+            var geometryValue = TryRead<byte[]>(layerGeometryColumn);
+            var isAquiferValue = TryRead<double?>(isAquiferColumn);
+            var belowPhreaticLevelValue = TryRead<double?>(belowPhreaticLevelColumn);
+            var abovePhreaticLevelValue = TryRead<double?>(abovePhreaticLevelColumn);
+            var dryUnitWeightValue = TryRead<double?>(dryUnitWeightColumn);
 
-            var geometryValue = Read<byte[]>(layerGeometryColumn);
-            TryRead(isAquiferColumn, out isAquiferValue);
-            TryRead(belowPhreaticLevelColumn, out belowPhreaticLevelValue);
-            TryRead(abovePhreaticLevelColumn, out abovePhreaticLevelValue);
-            TryRead(dryUnitWeightColumn, out dryUnitWeightValue);
-
             SoilLayer2D pipingSoilLayer = new PipingSoilLayer2DReader(geometryValue).Read();
             pipingSoilLayer.IsAquifer = isAquiferValue;
             pipingSoilLayer.BelowPhreaticLevel = belowPhreaticLevelValue;
@@ -462,7 +460,7 @@
         private void GetCount()
         {
             dataReader.Read();
-            Count = (int)Read<long>(profileCountColumn);
+            Count = (int)TryRead<long>(profileCountColumn);
             dataReader.NextResult();
         }
     }