Merge branch 'refs/heads/Ninja-DOM-Architecture' into Document

Conflicts:
	js/document/document-html.js

1 files changed, 1 insertions, 1 deletions

diff --git a/js/controllers/styles-controller.js b/js/controllers/styles-controller.js
index ae504f0e..3a942364 100755
--- a/js/controllers/styles-controller.js
+++ b/js/controllers/styles-controller.js
@@ -111,7 +111,7 @@ var stylesController = exports.StylesController = Montage.create(Component, {
         set : function(sheet) {
             if(sheet) {
                 this._defaultStylesheet = sheet;
-            } else {
+            } else if(this._activeDocument.model && this._activeDocument.model.views && this._activeDocument.model.views.design){//check that the document has a design view
                 
                 ///// Use the last stylesheet in the document as the default