Index: Ringtoets/Piping/src/Ringtoets.Piping.IO/SoilProfile/StochasticSoilProfileReader.cs
===================================================================
diff -u -rcdc41931db8cd6fbebe910c08d315d1b7066a6d2 -r64c21c2c91a3cef9df279e58efda8e45a9d598f7
--- Ringtoets/Piping/src/Ringtoets.Piping.IO/SoilProfile/StochasticSoilProfileReader.cs	(.../StochasticSoilProfileReader.cs)	(revision cdc41931db8cd6fbebe910c08d315d1b7066a6d2)
+++ Ringtoets/Piping/src/Ringtoets.Piping.IO/SoilProfile/StochasticSoilProfileReader.cs	(.../StochasticSoilProfileReader.cs)	(revision 64c21c2c91a3cef9df279e58efda8e45a9d598f7)
@@ -66,16 +66,19 @@
         /// <see cref="StochasticSoilProfile"/> instance of the information.
         /// </summary>
         /// <param name="stochasticSoilModelId">Identifier of the next <see cref="StochasticSoilModel"/> to look for.</param>
-        /// <returns>The next <see cref="StochasticSoilProfile"/> from the database, or <c>null</c> if no more soil profiles can be read.</returns>
+        /// <returns>The next <see cref="StochasticSoilProfile"/> from the database, or <c>null</c> if no more stochastic soil profiles can be read.</returns>
         /// <exception cref="StochasticSoilProfileReadException">Thrown when the database returned incorrect values for required properties.</exception>
         public StochasticSoilProfile ReadStochasticSoilProfile(long stochasticSoilModelId)
         {
             if (!HasNext)
             {
                 return null;
             }
-            MoveToStochasticSoilModelId(stochasticSoilModelId);
 
+            if (!MoveToStochasticSoilModelId(stochasticSoilModelId))
+            {
+                return null;
+            }
             try
             {
                 StochasticSoilProfile stochasticSoilProfile = ReadStochasticSoilProfileProbability();
@@ -136,19 +139,26 @@
             }
         }
 
-        private void MoveToStochasticSoilModelId(long stochasticSoilModelId)
+        private bool MoveToStochasticSoilModelId(long stochasticSoilModelId)
         {
             while (HasNext && ReadStochasticSoilModelId() < stochasticSoilModelId)
             {
                 MoveNext();
             }
+            if (ReadStochasticSoilModelId() == stochasticSoilModelId)
+            {
+                return true;
+            }
+            MoveToNextStochasticSoilModelId(stochasticSoilModelId);
+            return false;
         }
 
         private void MoveToNextStochasticSoilModelId(long stochasticSoilModelId)
         {
-            while (HasNext && ReadStochasticSoilModelId() == stochasticSoilModelId)
+            MoveNext();
+            if (HasNext)
             {
-                MoveNext();
+                HasNext = ReadStochasticSoilModelId() == stochasticSoilModelId;
             }
         }