diff --git a/src/renderer/components/EditBar.vue b/src/renderer/components/EditBar.vue
index 1e4a76e..43d6aaa 100644
--- a/src/renderer/components/EditBar.vue
+++ b/src/renderer/components/EditBar.vue
@@ -9,6 +9,9 @@
         <el-button type="primary" @click="undoLast">Last save</el-button>
       </span>
     </el-dialog>
+    <el-dialog title="Saving" :visible.sync="saveDialogVisible" width="30%" center>
+      <span style="center">Saving..</span>
+    </el-dialog>
 
     <EditButton icon="fas fa-save" v-on:click="save" :show="editing" tooltip="Save"></EditButton>
     <EditButton icon="fas fa-draw-polygon" v-on:click="drawPolyline" :show="editing" tooltip="Draw Taxiline"></EditButton>
@@ -18,11 +21,13 @@
 </template>
 
 <script lang="js">
+/* eslint-disable */
   import EditButton from './EditButton'
+  import Vue from 'vue'
   export default {
     components: { EditButton },
     data () {
-      return {isEditing: false, centerDialogVisible: false}
+      return {isEditing: false, centerDialogVisible: false, saveDialogVisible: false}
     },
     created () {
     },
@@ -45,8 +50,13 @@
       },
       save () {
         this.editing = false
-        this.$parent.$parent.$refs.editLayer.save()
-        this.$parent.$parent.$refs.editLayer.disableEdit()
+        Vue.set(this, 'saveDialogVisible', true)
+        this.editing = false
+        Vue.nextTick( () => {
+            this.$parent.$parent.$refs.editLayer.save()
+            this.$parent.$parent.$refs.editLayer.disableEdit()
+            Vue.set(this, 'saveDialogVisible', false)
+          }, this)
       },
       drawPolyline () {
         this.$parent.$parent.$refs.editLayer.drawPolyline()
diff --git a/src/renderer/components/EditLayer.vue b/src/renderer/components/EditLayer.vue
index c0f817c..b9021e2 100644
--- a/src/renderer/components/EditLayer.vue
+++ b/src/renderer/components/EditLayer.vue
@@ -237,7 +237,7 @@
       editedArc() {
         console.log('Edited Arc : ' + this.$store.state.Editable.index);
         var arc = this.groundnetLayerGroup.getLayer(this.$store.state.Editable.index);
-        if (arc) {
+        if (arc && arc instanceof L.Polyline) {
           arc.options.attributes = Object.assign({}, this.$store.state.Editable.data.arc)
           arc.updateStyle();
         }        
diff --git a/src/renderer/components/PavementLayer.vue b/src/renderer/components/PavementLayer.vue
index 49a15b4..df1a8f0 100644
--- a/src/renderer/components/PavementLayer.vue
+++ b/src/renderer/components/PavementLayer.vue
@@ -39,7 +39,9 @@
           this.groundnet.addTo(this.$parent.mapObject)
         }
         this.groundnet.eachLayer(l => {
-          l.bringToBack()
+          if (l) {
+            l.bringToBack()
+          }
         })
       },
       visible (feature) {
diff --git a/src/renderer/loaders/TaxiwaySegmentExtender.js b/src/renderer/loaders/TaxiwaySegmentExtender.js
index 352d69e..8f9ac75 100644
--- a/src/renderer/loaders/TaxiwaySegmentExtender.js
+++ b/src/renderer/loaders/TaxiwaySegmentExtender.js
@@ -55,9 +55,13 @@ exports.extendTaxiSegment = function (taxiwaySegment) {
                 },
                     () => { 
                         // Reset colour
-                        event.target.options.attributes.selected = false;
-                        event.target.updateStyle();
-                        this.unwatch();
+                        if(event.target instanceof L.Polyline &&
+                            event.target.options.attributes && 
+                            event.target.options.attributes.selected) {
+                            event.target.options.attributes.selected = false;
+                            event.target.updateStyle();
+                            this.unwatch();    
+                        }
                     }                    
                 ,
                 {