diff --git a/src/essence/Ancillary/Description.js b/src/essence/Ancillary/Description.js
index 780f2e7d..1b27282e 100644
--- a/src/essence/Ancillary/Description.js
+++ b/src/essence/Ancillary/Description.js
@@ -154,6 +154,12 @@ const Description = {
         })
     },
     updatePoint: function (activeLayer) {
+        if (
+            activeLayer == null ||
+            Description.L_.layers.data[activeLayer.options.layerName] == null
+        )
+            return
+
         this.descCont.style('display', 'flex')
         $('.mainDescription').animate(
             {
diff --git a/src/essence/Basics/Map_/Map_.js b/src/essence/Basics/Map_/Map_.js
index 1c5579b3..182a93f9 100644
--- a/src/essence/Basics/Map_/Map_.js
+++ b/src/essence/Basics/Map_/Map_.js
@@ -1314,7 +1314,10 @@ function clearOnMapClick(event) {
             }
 
             function checkBounds(layer) {
-                if (layer.feature.geometry.type.toLowerCase() === 'polygon') {
+                if (
+                    layer.feature &&
+                    layer.feature.geometry.type.toLowerCase() === 'polygon'
+                ) {
                     if (
                         L.leafletPip.pointInLayer(
                             [latlng.lng, latlng.lat],
diff --git a/src/essence/Tools/Draw/DrawTool_Editing.js b/src/essence/Tools/Draw/DrawTool_Editing.js
index 6ef5b7a7..ee941a4c 100644
--- a/src/essence/Tools/Draw/DrawTool_Editing.js
+++ b/src/essence/Tools/Draw/DrawTool_Editing.js
@@ -2348,12 +2348,15 @@ var Editing = {
             if (DrawTool.plugins?.Geologic?.custom?.resetGeologic)
                 DrawTool.plugins.Geologic.custom.resetGeologic()
 
-            const templaterProperties = templater.getValues(
-                L_.layers.layer[DrawTool.lastContextLayerIndexFileId.layer],
-                properties,
-                grouping ? true : false
-            )
-            if (templaterProperties === false) return
+            let templaterProperties = {}
+            if (templater) {
+                templaterProperties = templater.getValues(
+                    L_.layers.layer[DrawTool.lastContextLayerIndexFileId.layer],
+                    properties,
+                    grouping ? true : false
+                )
+                if (templaterProperties === false) return
+            }
 
             if (!grouping) {
                 //Then just a regular single save
diff --git a/src/essence/Tools/Draw/DrawTool_Files.js b/src/essence/Tools/Draw/DrawTool_Files.js
index 93cb3757..f4175742 100644
--- a/src/essence/Tools/Draw/DrawTool_Files.js
+++ b/src/essence/Tools/Draw/DrawTool_Files.js
@@ -154,7 +154,7 @@ var Files = {
                 DrawTool.setDrawingType(drawType)
             } else {
                 CursorInfo.update(
-                    `Please select a file from the list below (by clicking on its name). If none exist, create one with the + above.`,
+                    `Please select a file from the list below (by clicking on its name). If none exist, make one with the create button below.`,
                     6000,
                     false,
                     {