Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Factories/RingtoetsMapDataFeaturesFactory.cs
===================================================================
diff -u -r2a81f01756e227d5ce93717b21b87e8a5cd5fcbb -refaa457663a97df904e1d6462b0fcabf7cd53893
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Factories/RingtoetsMapDataFeaturesFactory.cs	(.../RingtoetsMapDataFeaturesFactory.cs)	(revision 2a81f01756e227d5ce93717b21b87e8a5cd5fcbb)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Factories/RingtoetsMapDataFeaturesFactory.cs	(.../RingtoetsMapDataFeaturesFactory.cs)	(revision efaa457663a97df904e1d6462b0fcabf7cd53893)
@@ -77,10 +77,10 @@
         /// <param name="id">The id of the <see cref="IAssessmentSection"/>.</param>
         /// <param name="name">The name of the <see cref="IAssessmentSection"/>.</param>
         /// <returns>A collection of features or an empty collection when <paramref name="referenceLine"/> 
-        /// is <c>null</c>.</returns>
+        /// is <c>null</c> or has no geometry.</returns>
         public static IEnumerable<MapFeature> CreateReferenceLineFeatures(ReferenceLine referenceLine, string id, string name)
         {
-            if (referenceLine != null)
+            if (referenceLine != null && referenceLine.Points.Any())
             {
                 MapFeature feature = CreateSingleLineMapFeature(referenceLine.Points);
                 feature.MetaData[RingtoetsCommonUtilResources.MetaData_ID] = id;
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Factories/RingtoetsMapDataFeaturesFactoryTest.cs
===================================================================
diff -u -r2a81f01756e227d5ce93717b21b87e8a5cd5fcbb -refaa457663a97df904e1d6462b0fcabf7cd53893
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Factories/RingtoetsMapDataFeaturesFactoryTest.cs	(.../RingtoetsMapDataFeaturesFactoryTest.cs)	(revision 2a81f01756e227d5ce93717b21b87e8a5cd5fcbb)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Factories/RingtoetsMapDataFeaturesFactoryTest.cs	(.../RingtoetsMapDataFeaturesFactoryTest.cs)	(revision efaa457663a97df904e1d6462b0fcabf7cd53893)
@@ -86,6 +86,16 @@
         }
 
         [Test]
+        public void CreateReferenceLineFeatures_ReferenceLineWithEmptyGeometry_ReturnsEmptyFeaturesCollection()
+        {
+            // Call
+            IEnumerable<MapFeature> features = RingtoetsMapDataFeaturesFactory.CreateReferenceLineFeatures(new ReferenceLine(), string.Empty, string.Empty);
+
+            // Assert
+            CollectionAssert.IsEmpty(features);
+        }
+
+        [Test]
         public void CreateReferenceLineFeatures_GivenReferenceLine_ReturnsReferenceLineFeature()
         {
             // Setup