Merge branch 'refs/heads/ninja-internal-master' into Codeview-improvements

1 files changed, 1 insertions, 1 deletions

diff --git a/js/stage/layout.js b/js/stage/layout.js
index a096848e..0a76dbe5 100755
--- a/js/stage/layout.js
+++ b/js/stage/layout.js
@@ -174,7 +174,7 @@ exports.Layout = Montage.create(Component, {
             var tmpMat = viewUtils.getLocalToGlobalMatrix( item );
 
             var zoomFactor = 1;
-            if (this.stage._viewport.style && this.stage._viewport.style.zoom) {
+            if (this.stage._viewport && this.stage._viewport.style && this.stage._viewport.style.zoom) {
                                 zoomFactor = Number(this.stage._viewport.style.zoom);
             }