diff --git a/javascript/mapChange.js b/javascript/mapChange.js
index 771289762e99cb1bf6b26a9a94fc36580e4e8820..bcb7ab1224b30dde81fee0362925d43329d60228 100644
--- a/javascript/mapChange.js
+++ b/javascript/mapChange.js
@@ -59,6 +59,11 @@ function changeMap() {
     if (isHeat) {
       heatmap();
     }
+    if (newPoint) {
+      newPoint = false;
+      closeBox("makeNewPointBox");
+      document.getElementById("addPointButton").style.color = "orangered";
+    }
 
     if (points != null) {
       if (points != null) {
diff --git a/javascript/pointMap.js b/javascript/pointMap.js
index 26c87c96247bcae9fa119212d48b274bbc827d83..a74fc5b2101ce197cca47a3b15e2281c51cc46ce 100644
--- a/javascript/pointMap.js
+++ b/javascript/pointMap.js
@@ -22,8 +22,10 @@ function addPoint() {
     document.getElementById("addPointButton").style.color = "green";
     newPoint = true;
 
-    if (!map.hasLayer(points)) {
-        showPoints();
+    if (points != null) {
+        if (!map.hasLayer(points)) {
+            showPoints();
+        }
     }
 
     if (isTIN) {