diff --git a/app/assets/javascripts/src/Metamaps.JIT.js.erb b/app/assets/javascripts/src/Metamaps.JIT.js.erb
index 283359aa..273850cb 100644
--- a/app/assets/javascripts/src/Metamaps.JIT.js.erb
+++ b/app/assets/javascripts/src/Metamaps.JIT.js.erb
@@ -108,7 +108,7 @@ Metamaps.JIT = {
         _.each(results[1], function (synapse) {
             mapping = synapse.getMapping();
             Metamaps.Synapses.remove(synapse);
-            Metamaps.Mappings.remove(mapping);
+            if (Metamaps.Mappings) Metamaps.Mappings.remove(mapping);
         });
 
         if (self.vizData.length == 0) {
diff --git a/app/assets/javascripts/src/Metamaps.js.erb b/app/assets/javascripts/src/Metamaps.js.erb
index ff6d57e6..d93b39ef 100644
--- a/app/assets/javascripts/src/Metamaps.js.erb
+++ b/app/assets/javascripts/src/Metamaps.js.erb
@@ -4023,11 +4023,11 @@ Metamaps.Topic = {
                 nodeOnViz.setPos(new $jit.Complex(mapping.get('xloc'), mapping.get('yloc')), "end");
             }
             if (Metamaps.Create.newTopic.addSynapse && permitCreateSynapseAfter) {
-                Metamaps.Create.newSynapse.topic1id = tempNode.getData('topic').id;
+                Metamaps.Create.newSynapse.topic1id = Metamaps.tempNode.getData('topic').id;
                 
                 // position the form
-                midpoint.x = tempNode.pos.getc().x + (nodeOnViz.pos.getc().x - tempNode.pos.getc().x) / 2;
-                midpoint.y = tempNode.pos.getc().y + (nodeOnViz.pos.getc().y - tempNode.pos.getc().y) / 2;
+                midpoint.x = Metamaps.tempNode.pos.getc().x + (nodeOnViz.pos.getc().x - Metamaps.tempNode.pos.getc().x) / 2;
+                midpoint.y = Metamaps.tempNode.pos.getc().y + (nodeOnViz.pos.getc().y - Metamaps.tempNode.pos.getc().y) / 2;
                 pixelPos = Metamaps.Util.coordsToPixels(midpoint);
                 $('#new_synapse').css('left', pixelPos.x + "px");
                 $('#new_synapse').css('top', pixelPos.y + "px");
@@ -4037,9 +4037,9 @@ Metamaps.Topic = {
                     modes: ["node-property:dim"],
                     duration: 500,
                     onComplete: function () {
-                        tempNode = null;
-                        tempNode2 = null;
-                        tempInit = false;
+                        Metamaps.tempNode = null;
+                        Metamaps.tempNode2 = null;
+                        Metamaps.tempInit = false;
                     }
                 });
             } else {