4 files changed, 18 insertions, 3 deletions

diff --git a/js/controllers/document-controller.js b/js/controllers/document-controller.js
index 714d1404..02031922 100755
--- a/js/controllers/document-controller.js
+++ b/js/controllers/document-controller.js
@@ -338,6 +338,10 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
 
                 this.application.ninja.stage.hideCanvas(true);
             }
+
+            NJevent("closeDocument", doc.uri);
+
+            doc=null;
         }
     },
 
diff --git a/js/helper-classes/3D/draw-utils.js b/js/helper-classes/3D/draw-utils.js
index 37fc1cfc..85870097 100755
--- a/js/helper-classes/3D/draw-utils.js
+++ b/js/helper-classes/3D/draw-utils.js
@@ -126,8 +126,8 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, {
             this.setWorkingPlane( Vector.create( [0,0,1,0] ) );
 
             //Loop through all the top-level children of the current document and call drawUtils.addElement on them
-            if(this.application.ninja.currentDocument.documentRoot.hasChildNodes()){
-                documentRootChildren = this.application.ninja.currentDocument.documentRoot.childNodes;
+            if(this.application.ninja.currentDocument._liveNodeList.length > 0){
+                documentRootChildren = this.application.ninja.currentDocument._liveNodeList;
                 for(i=0;i<documentRootChildren.length;i++){
                     this.addElement(documentRootChildren[i]);
                 }
diff --git a/js/mediators/keyboard-mediator.js b/js/mediators/keyboard-mediator.js
index a4bf9baa..f05d3382 100755
--- a/js/mediators/keyboard-mediator.js
+++ b/js/mediators/keyboard-mediator.js
@@ -207,7 +207,13 @@ exports.KeyboardMediator = Montage.create(Component, {
 
             // Check if cmd+s/ctrl+s for Save (Windows/Mac)
             if ((evt.keyCode == Keyboard.S) && (evt.ctrlKey || evt.metaKey) && !evt.shiftKey) {
-                NJevent("executeSave");
+                try{
+                    NJevent("executeSave");
+                }
+                catch(e){
+                    console.warn("Unable to save");
+                    console.log(e.stack);
+                }
                 evt.preventDefault();
                 return;
             }
diff --git a/js/stage/layout.js b/js/stage/layout.js
index a94dd10c..de4c67c1 100755
--- a/js/stage/layout.js
+++ b/js/stage/layout.js
@@ -98,6 +98,11 @@ exports.Layout = Montage.create(Component, {
 
     handleSelectionChange: {
         value: function(event) {
+
+            if(this.application.ninja.documentController.activeDocument === null){
+                return;
+            }
+
             // Make an array copy of the line node list which is not an array like object
             this.domTree = Array.prototype.slice.call(this.application.ninja.documentController.activeDocument._liveNodeList, 0);