2 files changed, 6 insertions, 4 deletions

diff --git a/js/document/html-document.js b/js/document/html-document.js
index 3f39c4df..80930af2 100755
--- a/js/document/html-document.js
+++ b/js/document/html-document.js
@@ -770,7 +770,8 @@ exports.HTMLDocument = Montage.create(TextDocument, {
                                 }
                         }
                 }
-                        return {mode: 'html', document: this._userDocument, webgl: this.glData, styles: styles, head: this._templateDocument.head.innerHTML, body: this._templateDocument.body.innerHTML};
+                        //return {mode: 'html', document: this._userDocument, webgl: this.glData, styles: styles, head: this._templateDocument.head.innerHTML, body: this._templateDocument.body.innerHTML};
+                        return {mode: 'html', document: this._userDocument, styles: styles, head: this._templateDocument.head.innerHTML, body: this._templateDocument.body.innerHTML};
                 } else if (this.currentView === "code"){
                         //TODO: Would this get call when we are in code of HTML?
                 } else {
@@ -793,7 +794,8 @@ exports.HTMLDocument = Montage.create(TextDocument, {
                                 }
                         }
                 }
-                        return {mode: 'html', document: this._userDocument, webgl: this.glData, css: css, head: this._templateDocument.head.innerHTML, body: this._templateDocument.body.innerHTML};
+                        //return {mode: 'html', document: this._userDocument, webgl: this.glData, css: css, head: this._templateDocument.head.innerHTML, body: this._templateDocument.body.innerHTML};
+                        return {mode: 'html', document: this._userDocument, css: css, head: this._templateDocument.head.innerHTML, body: this._templateDocument.body.innerHTML};
                 } else if (this.currentView === "code"){
                         //TODO: Would this get call when we are in code of HTML?
                 } else {
diff --git a/js/mediators/io-mediator.js b/js/mediators/io-mediator.js
index 23668e13..097f5975 100644
--- a/js/mediators/io-mediator.js
+++ b/js/mediators/io-mediator.js
@@ -153,7 +153,7 @@ exports.IoMediator = Montage.create(Component, {
                 switch (file.mode) {
                         case 'html':
                                 //Copy webGL library if needed
-                                if (file.webgl.length > 0) {
+                                if (file.webgl && file.webgl.length > 0) {
                                         for (var i in this.application.ninja.coreIoApi.ninjaLibrary.libs) {
                                                 //Checking for RDGE library to be available
                                                 if (this.application.ninja.coreIoApi.ninjaLibrary.libs[i].name === 'RDGE') {
@@ -353,7 +353,7 @@ exports.IoMediator = Montage.create(Component, {
                         }
                 }
                 //Checking for webGL elements in document
-                if (template.webgl.length) {
+                if (template.webgl && template.webgl.length) {
                         //
                         var json, matchingtags = [], webgltag, scripts = template.document.content.document.getElementsByTagName('script');
                         //