Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.IO/HydraulicBoundaryDatabase/HydraulicBoundaryDatabaseReader.cs
===================================================================
diff -u -rb91c8b5bcdda57007ccfa9df3e1b208fd3e97da1 -r28f38b52d5fbe641ee065ac0f505b34a202feb09
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.IO/HydraulicBoundaryDatabase/HydraulicBoundaryDatabaseReader.cs	(.../HydraulicBoundaryDatabaseReader.cs)	(revision b91c8b5bcdda57007ccfa9df3e1b208fd3e97da1)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.IO/HydraulicBoundaryDatabase/HydraulicBoundaryDatabaseReader.cs	(.../HydraulicBoundaryDatabaseReader.cs)	(revision 28f38b52d5fbe641ee065ac0f505b34a202feb09)
@@ -73,15 +73,15 @@
         {
             try
             {
-                using (IDataReader dataReader = CreateDataReader(HydraulicBoundaryDatabaseQueryBuilder.GetTrackIdQuery(),
-                                                                 new SQLiteParameter
-                                                                 {
-                                                                     DbType = DbType.String
-                                                                 }))
+                using (IDataReader reader = CreateDataReader(HydraulicBoundaryDatabaseQueryBuilder.GetTrackIdQuery(),
+                                                             new SQLiteParameter
+                                                             {
+                                                                 DbType = DbType.String
+                                                             }))
                 {
-                    if (dataReader.Read())
+                    if (reader.Read())
                     {
-                        return Convert.ToInt64(dataReader[GeneralTableDefinitions.TrackId]);
+                        return Convert.ToInt64(reader[GeneralTableDefinitions.TrackId]);
                     }
 
                     throw new CriticalFileReadException(new FileReaderErrorMessageBuilder(Path)
@@ -107,23 +107,21 @@
         /// <exception cref="CriticalFileReadException">Thrown when a query could not be executed on the database schema.</exception>
         private string ReadVersion()
         {
-            try
+            using (IDataReader reader = CreateDataReader(HydraulicBoundaryDatabaseQueryBuilder.GetVersionQuery(), null))
             {
-                using (IDataReader dataReader = CreateDataReader(HydraulicBoundaryDatabaseQueryBuilder.GetVersionQuery(), null))
+                if (reader.Read())
                 {
-                    string version = Convert.ToString(dataReader[GeneralTableDefinitions.GeneratedVersion]);
+                    string version = Convert.ToString(reader[GeneralTableDefinitions.GeneratedVersion]);
 
                     if (!string.IsNullOrEmpty(version))
                     {
                         return version;
                     }
                 }
+
+                string message = new FileReaderErrorMessageBuilder(Path).Build(Resources.HydraulicBoundaryDatabaseReader_Critical_Unexpected_value_on_column);
+                throw new CriticalFileReadException(message);
             }
-            catch (SQLiteException exception)
-            {
-                string message = new FileReaderErrorMessageBuilder(Path).Build(Resources.Error_HydraulicBoundaryLocation_read_from_database);
-                throw new CriticalFileReadException(message, exception);
-            }
         }
 
         /// <summary>