diff --git a/frontend/src/Metamaps/DataModel/index.js b/frontend/src/Metamaps/DataModel/index.js
index 04690589..272f1717 100644
--- a/frontend/src/Metamaps/DataModel/index.js
+++ b/frontend/src/Metamaps/DataModel/index.js
@@ -82,7 +82,7 @@ const DataModel = {
     var starredCollection = serverData.Starred ? serverData.Starred : []
     var mapperCollection = serverData.Mapper ? serverData.Mapper : []
     var mapperOptionsObj = { id: 'mapper', sortBy: 'updated_at' }
-    if (serverData.Mapper.mapperId) {
+    if (serverData.Mapper && serverData.Mapper.mapperId) {
       mapperCollection = serverData.Mapper.models
       mapperOptionsObj.mapperId = serverData.Mapper.mapperId
     }
diff --git a/frontend/src/Metamaps/Listeners.js b/frontend/src/Metamaps/Listeners.js
index ff9434cd..c3b644df 100644
--- a/frontend/src/Metamaps/Listeners.js
+++ b/frontend/src/Metamaps/Listeners.js
@@ -19,7 +19,7 @@ const Listeners = {
       if (!(Active.Map || Active.Topic)) return
 
       const onCanvas = e.target.tagName === 'BODY'
-
+      
       switch (e.which) {
         case 13: // if enter key is pressed
           // prevent topic creation if sending a message
@@ -30,6 +30,10 @@ const Listeners = {
         case 27: // if esc key is pressed
           JIT.escKeyHandler()
           break
+        case 46: // if DEL is pressed
+          e.preventDefault()
+          Control.deleteSelected()
+          break
         case 65: // if a or A is pressed
           if ((e.ctrlKey || e.metaKey) && onCanvas) {
             const nodesCount = Object.keys(Visualize.mGraph.graph.nodes).length
@@ -113,12 +117,6 @@ const Listeners = {
             })
           }
           break
-        case 127: // if DEL is pressed
-          if (e.ctrlKey || e.metaKey) {
-            e.preventDefault()
-            Control.deleteSelected()
-          }
-          break
         case 191: // if / is pressed
           if (e.ctrlKey || e.metaKey) {
             Search.focus()
@@ -129,7 +127,6 @@ const Listeners = {
           break
       }
     })
-
     $(window).resize(function() {
       if (Visualize && Visualize.mGraph) {
         Util.resizeCanvas(Visualize.mGraph.canvas)