Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingChartDataFactory.cs
===================================================================
diff -u -r848c3a050bda5fb0dd74232deb7f1d5eba8ecbf6 -r78053965aab36c2c21e2706e73d84a9dc2cd5f3a
--- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingChartDataFactory.cs	(.../PipingChartDataFactory.cs)	(revision 848c3a050bda5fb0dd74232deb7f1d5eba8ecbf6)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingChartDataFactory.cs	(.../PipingChartDataFactory.cs)	(revision 78053965aab36c2c21e2706e73d84a9dc2cd5f3a)
@@ -25,6 +25,7 @@
 using System.Linq;
 using Core.Components.Charting.Data;
 using Core.Components.Charting.Styles;
+using Ringtoets.Piping.Data;
 using Ringtoets.Piping.Forms.Properties;
 using Ringtoets.Piping.Primitives;
 using PipingDataResources = Ringtoets.Piping.Data.Properties.Resources;
@@ -189,15 +190,20 @@
         }
 
         /// <summary>
-        /// Updates the name of <paramref name="chartData"/> based on <paramref name="soilProfile"/>.
+        /// Updates the name of <paramref name="chartData"/> based on <paramref name="stochasticSoilProfile"/>.
         /// </summary>
         /// <param name="chartData">The <see cref="ChartDataCollection"/> to update the name for.</param>
-        /// <param name="soilProfile">The <see cref="PipingSoilProfile"/> used for obtaining the name.</param>
-        /// <remarks>When <paramref name="soilProfile"/> is <c>null</c> a default name is set (<seealso cref="CreateSoilProfileChartData"/>).</remarks>
-        public static void UpdateSoilProfileChartDataName(ChartDataCollection chartData, PipingSoilProfile soilProfile)
+        /// <param name="stochasticSoilProfile">The <see cref="StochasticSoilProfile"/> used for obtaining the name.</param>
+        /// <remarks>A default name is set (<see cref="CreateSurfaceLineChartData"/>) when:
+        /// <list type="bullet">
+        /// <item><paramref name="stochasticSoilProfile"/> is <c>null</c>;</item>
+        /// <item>the <see cref="PipingSoilProfile"/> in <paramref name="stochasticSoilProfile"/> is <c>null</c>.</item>
+        /// </list>
+        /// </remarks>
+        public static void UpdateSoilProfileChartDataName(ChartDataCollection chartData, StochasticSoilProfile stochasticSoilProfile)
         {
-            chartData.Name = soilProfile != null
-                                 ? soilProfile.Name
+            chartData.Name = stochasticSoilProfile != null && stochasticSoilProfile.SoilProfile != null
+                                 ? stochasticSoilProfile.SoilProfile.Name
                                  : Resources.StochasticSoilProfileProperties_DisplayName;
         }
 
Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingInputView.cs
===================================================================
diff -u -r848c3a050bda5fb0dd74232deb7f1d5eba8ecbf6 -r78053965aab36c2c21e2706e73d84a9dc2cd5f3a
--- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingInputView.cs	(.../PipingInputView.cs)	(revision 848c3a050bda5fb0dd74232deb7f1d5eba8ecbf6)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingInputView.cs	(.../PipingInputView.cs)	(revision 78053965aab36c2c21e2706e73d84a9dc2cd5f3a)
@@ -191,7 +191,7 @@
                                    soilLayerChartDataLookup.Add(sl);
                                });
 
-                PipingChartDataFactory.UpdateSoilProfileChartDataName(soilProfileChartData, stochasticSoilProfile.SoilProfile);
+                PipingChartDataFactory.UpdateSoilProfileChartDataName(soilProfileChartData, stochasticSoilProfile);
 
                 soilProfileChartData.NotifyObservers();
             }
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingChartDataFactoryTest.cs
===================================================================
diff -u -r848c3a050bda5fb0dd74232deb7f1d5eba8ecbf6 -r78053965aab36c2c21e2706e73d84a9dc2cd5f3a
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingChartDataFactoryTest.cs	(.../PipingChartDataFactoryTest.cs)	(revision 848c3a050bda5fb0dd74232deb7f1d5eba8ecbf6)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingChartDataFactoryTest.cs	(.../PipingChartDataFactoryTest.cs)	(revision 78053965aab36c2c21e2706e73d84a9dc2cd5f3a)
@@ -27,6 +27,7 @@
 using Core.Components.Charting.Data;
 using Core.Components.Charting.Styles;
 using NUnit.Framework;
+using Ringtoets.Piping.Data;
 using Ringtoets.Piping.Forms.Properties;
 using Ringtoets.Piping.Forms.Views;
 using Ringtoets.Piping.Primitives;
@@ -233,7 +234,7 @@
         }
 
         [Test]
-        public void UpdateSoilProfileChartDataName_SoilProfileNull_NameSetToDefaultSoilProfileName()
+        public void UpdateSoilProfileChartDataName_StochasticSoilProfileNull_NameSetToDefaultSoilProfileName()
         {
             // Setup
             var chartData = new ChartDataCollection("test name");
@@ -246,17 +247,34 @@
         }
 
         [Test]
-        public void UpdateSoilProfileChartDataName_SoilProfile_NameSetToSoilProfileName()
+        public void UpdateSoilProfileChartDataName_SoilProfileNull_NameSetToDefaultSoilProfileName()
         {
             // Setup
             var chartData = new ChartDataCollection("test name");
-            var soilProfile = new PipingSoilProfile("soil profile name", 2.0, new[]
+            var stochasticSoilProfile = new StochasticSoilProfile(0.1, SoilProfileType.SoilProfile1D, 1);
+
+            // Call
+            PipingChartDataFactory.UpdateSoilProfileChartDataName(chartData, stochasticSoilProfile);
+
+            // Assert
+            Assert.AreEqual(Resources.StochasticSoilProfileProperties_DisplayName, chartData.Name);
+        }
+
+        [Test]
+        public void UpdateSoilProfileChartDataName_StochasticSoilProfileWithSoilProfile_NameSetToSoilProfileName()
+        {
+            // Setup
+            var chartData = new ChartDataCollection("test name");
+            var stochasticSoilProfile = new StochasticSoilProfile(0.1, SoilProfileType.SoilProfile1D, 1)
             {
-                new PipingSoilLayer(3.2)
-            }, SoilProfileType.SoilProfile1D, 0);
+                SoilProfile = new PipingSoilProfile("soil profile name", 2.0, new[]
+                {
+                    new PipingSoilLayer(3.2)
+                }, SoilProfileType.SoilProfile1D, 0)
+            };
 
             // Call
-            PipingChartDataFactory.UpdateSoilProfileChartDataName(chartData, soilProfile);
+            PipingChartDataFactory.UpdateSoilProfileChartDataName(chartData, stochasticSoilProfile);
 
             // Assert
             Assert.AreEqual("soil profile name", chartData.Name);