2 files changed, 3 insertions, 3 deletions

diff --git a/js/helper-classes/3D/view-utils.js b/js/helper-classes/3D/view-utils.js
index 0a4fe0ac..0080bf90 100755
--- a/js/helper-classes/3D/view-utils.js
+++ b/js/helper-classes/3D/view-utils.js
@@ -1005,9 +1005,9 @@ exports.ViewUtils = Montage.create(Component, {
                 this.popViewportObj();
 
                 if (elt === this.application.ninja.currentDocument.documentRoot)  break;
-                if (this.application.ninja.currentDocument.documentRoot && elt === this.application.ninja.currentDocument.documentRoot.parentNode)  break;
+                if (elt === this.application.ninja.currentDocument.documentRoot.parentNode)  break;
                 elt = elt.offsetParent;
-                if (this.application.ninja.currentDocument.documentRoot && elt === this.application.ninja.currentDocument.documentRoot.parentNode)  break;
+                if (elt === this.application.ninja.currentDocument.documentRoot.parentNode)  break;
             }
 
             return mat;
diff --git a/js/panels/Splitter.js b/js/panels/Splitter.js
index 8675d314..f0fb1a45 100755
--- a/js/panels/Splitter.js
+++ b/js/panels/Splitter.js
@@ -111,7 +111,7 @@ exports.Splitter = Montage.create(Component, {
             } else {
                 this.panel.removeEventListener("webkitTransitionEnd", this, false);
             }
-            if(this.application.ninja.currentDocument.currentView === "design"){
+            if(this.application.ninja.currentDocument && this.application.ninja.currentDocument.currentView === "design"){
                 this.application.ninja.stage.resizeCanvases = true;
             }
         }