Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/SoilProfile/StochasticSoilModelReaderTest.cs
===================================================================
diff -u -rdc338e85283e37af4984f737a9f7ae0d213596be -rcdc41931db8cd6fbebe910c08d315d1b7066a6d2
--- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/SoilProfile/StochasticSoilModelReaderTest.cs	(.../StochasticSoilModelReaderTest.cs)	(revision dc338e85283e37af4984f737a9f7ae0d213596be)
+++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/SoilProfile/StochasticSoilModelReaderTest.cs	(.../StochasticSoilModelReaderTest.cs)	(revision cdc41931db8cd6fbebe910c08d315d1b7066a6d2)
@@ -28,7 +28,6 @@
 using Core.Common.Utils.Builders;
 using NUnit.Framework;
 using Ringtoets.Piping.Data;
-using Ringtoets.Piping.IO.Exceptions;
 using Ringtoets.Piping.IO.Properties;
 using Ringtoets.Piping.IO.SoilProfile;
 using UtilsResources = Core.Common.Utils.Properties.Resources;
@@ -205,7 +204,7 @@
                 TestDelegate test = () => stochasticSoilModelDatabaseReader.ReadStochasticSoilModel();
 
                 // Assert
-                StochasticSoilProfileReadException exception = Assert.Throws<StochasticSoilProfileReadException>(test);
+                CriticalFileReadException exception = Assert.Throws<CriticalFileReadException>(test);
                 Assert.AreEqual(expectedMessage, exception.Message);
             }
 
@@ -241,5 +240,24 @@
 
             Assert.IsTrue(TestHelper.CanOpenFileForWrite(dbFile));
         }
+
+        [Test]
+        public void ReadStochasticSoilProfile_EmptyDatabase_ReturnsNull()
+        {
+            // Setup
+            var dbName = "emptyschema.soil";
+            string dbFile = Path.Combine(testDataPath, dbName);
+
+            using (var stochasticSoilModelDatabaseReader = new StochasticSoilModelReader(dbFile))
+            {
+                // Call
+                StochasticSoilModel stochasticSoilModel = stochasticSoilModelDatabaseReader.ReadStochasticSoilModel();
+
+                // Assert
+                Assert.IsNull(stochasticSoilModel);
+                Assert.IsFalse(stochasticSoilModelDatabaseReader.HasNext);
+            }
+            Assert.IsTrue(TestHelper.CanOpenFileForWrite(dbFile));
+        }
     }
 }
\ No newline at end of file