Index: src/Deltares.DSoilModel.Forms/DSoilModelGeometryEditor.cs
===================================================================
diff -u -r89 -r129
--- src/Deltares.DSoilModel.Forms/DSoilModelGeometryEditor.cs	(.../DSoilModelGeometryEditor.cs)	(revision 89)
+++ src/Deltares.DSoilModel.Forms/DSoilModelGeometryEditor.cs	(.../DSoilModelGeometryEditor.cs)	(revision 129)
@@ -121,7 +121,7 @@
             }
             set
             {
-                if (value)
+                if (value && selectedGeom != null)
                 {
                     geometryEditor.SpatialEditor.InsertMode = ShapeInsertMode.PolyLine;
                     geometryEditor.SpatialEditor.InsertRepeatMode = ShapeInsertRepeatMode.Connect;
@@ -149,7 +149,7 @@
             }
             set
             {
-                if (value)
+                if (value && selectedGeom != null)
                 {
                     geometryEditor.SpatialEditor.InsertMode = ShapeInsertMode.Point;
                     geometryEditor.SpatialEditor.InsertRepeatMode = ShapeInsertRepeatMode.Repeat;
@@ -296,7 +296,7 @@
             bool isCenterCrestDefined = dataObjectEmptySelectionIsSoilProfile2D && !double.IsNaN(((SoilProfile2D) spatialEditor.EmptySelection.DataObject).CenterCrestLocation);
             switch (property)
             {
-                case "CreatePointInLine":
+                case "CreatePointInLine": return allowEdit && selectedGeom != null && selectedGeom.Curves.Count > 0;
                 case "CreatePolyline":
                     return allowEdit && selectedGeom != null;
                 case "InsertCpt":