Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingChartDataFactoryTest.cs
===================================================================
diff -u -r449e2761ad14af6e84ea5c1a56aea71bc535e8f9 -r5dc7eef906ffd48f56d14ea0b0b85441e4f2d529
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingChartDataFactoryTest.cs	(.../PipingChartDataFactoryTest.cs)	(revision 449e2761ad14af6e84ea5c1a56aea71bc535e8f9)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingChartDataFactoryTest.cs	(.../PipingChartDataFactoryTest.cs)	(revision 5dc7eef906ffd48f56d14ea0b0b85441e4f2d529)
@@ -152,6 +152,27 @@
         }
 
         [Test]
+        public void CreateEntryPoint_EntryPointNotOnSurfaceLine_ReturnsEmptyChartData()
+        {
+            // Setup
+            var surfaceLine = GetSurfaceLineWithGeometry();
+
+            var input = new PipingInput(new GeneralPipingInput())
+            {
+                SurfaceLine = surfaceLine
+            };
+
+            // Call
+            ChartData data = PipingChartDataFactory.CreateEntryPoint((RoundedDouble)10, input.SurfaceLine);
+
+            // Assert
+            Assert.IsInstanceOf<ChartPointData>(data);
+            ChartPointData chartPointData = (ChartPointData)data;
+            Assert.AreEqual(Resources.PipingInput_EntryPointL_DisplayName, data.Name);
+            Assert.IsEmpty(chartPointData.Points);
+        }
+
+        [Test]
         public void CreateExitPoint_ExitPointNaN_ThrowsArgumentException()
         {
             // Call
@@ -203,6 +224,27 @@
         }
 
         [Test]
+        public void CreateExitPoint_ExitPointNotOnSurfaceLine_ReturnsEmptyChartData()
+        {
+            // Setup
+            var surfaceLine = GetSurfaceLineWithGeometry();
+
+            var input = new PipingInput(new GeneralPipingInput())
+            {
+                SurfaceLine = surfaceLine
+            };
+
+            // Call
+            ChartData data = PipingChartDataFactory.CreateExitPoint((RoundedDouble) 10, input.SurfaceLine);
+            
+            // Assert
+            Assert.IsInstanceOf<ChartPointData>(data);
+            ChartPointData chartPointData = (ChartPointData) data;
+            Assert.AreEqual(Resources.PipingInput_ExitPointL_DisplayName, data.Name);
+            Assert.IsEmpty(chartPointData.Points);
+        }
+
+        [Test]
         public void CreateDitchPolderSide_SurfaceLineNull_ThrowsArgumentNullException()
         {
             // Call