Index: Ringtoets/Piping/src/Ringtoets.Piping.IO/SoilProfile/StochasticSoilProfileReader.cs =================================================================== diff -u -r3f6060a9d5e2b63619d407706139325e8efb05df -r973ed43129e04e3bf314d654b5a9ff877f08f175 --- Ringtoets/Piping/src/Ringtoets.Piping.IO/SoilProfile/StochasticSoilProfileReader.cs (.../StochasticSoilProfileReader.cs) (revision 3f6060a9d5e2b63619d407706139325e8efb05df) +++ Ringtoets/Piping/src/Ringtoets.Piping.IO/SoilProfile/StochasticSoilProfileReader.cs (.../StochasticSoilProfileReader.cs) (revision 973ed43129e04e3bf314d654b5a9ff877f08f175) @@ -156,7 +156,7 @@ { MoveNext(); } - if (ReadStochasticSoilModelId() == stochasticSoilModelId) + if (HasNext && ReadStochasticSoilModelId() == stochasticSoilModelId) { return true; } Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/SoilProfile/StochasticSoilProfileReaderTest.cs =================================================================== diff -u -rbf334f50530164badedba45a78f3aab857ae1bf6 -r973ed43129e04e3bf314d654b5a9ff877f08f175 --- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/SoilProfile/StochasticSoilProfileReaderTest.cs (.../StochasticSoilProfileReaderTest.cs) (revision bf334f50530164badedba45a78f3aab857ae1bf6) +++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/SoilProfile/StochasticSoilProfileReaderTest.cs (.../StochasticSoilProfileReaderTest.cs) (revision 973ed43129e04e3bf314d654b5a9ff877f08f175) @@ -238,6 +238,25 @@ } [Test] + public void ReadStochasticSoilProfile_SoilModelIdNotInDataBase_ReturnNull() + { + // Setup + var dbName = "complete.soil"; + string dbFile = Path.Combine(testDataPath, dbName); + + using (var stochasticSoilProfileReader = new StochasticSoilProfileReader(dbFile)) + { + // Call + StochasticSoilProfile stochasticSoilProfile = stochasticSoilProfileReader.ReadStochasticSoilProfile(987654321); + + // Assert + Assert.IsNull(stochasticSoilProfile); + } + + Assert.IsTrue(TestHelper.CanOpenFileForWrite(dbFile)); + } + + [Test] public void ReadStochasticSoilProfile_EmptyDatabase_ReturnsNull() { // Setup