Squashed master into dom-architecture

Signed-off-by: Valerio Virgillito <valerio@motorola.com>

1 files changed, 3 insertions, 1 deletions

diff --git a/js/controllers/styles-controller.js b/js/controllers/styles-controller.js
index 7707a826..26485508 100755
--- a/js/controllers/styles-controller.js
+++ b/js/controllers/styles-controller.js
@@ -795,7 +795,9 @@ var stylesController = exports.StylesController = Montage.create(Component, {
             ///// method to apply/test the new value
             dec.setProperty(property, value, priority);
 
-            this.styleSheetModified(rule.parentStyleSheet);
+            if(rule.parentStyleSheet) {
+                this.styleSheetModified(rule.parentStyleSheet);
+            }
 
             ///// Return browser value for value we just set
             return dec.getPropertyValue(property);