2 files changed, 6 insertions, 2 deletions

diff --git a/js/controllers/color-controller.js b/js/controllers/color-controller.js
index 8e000b19..c6d664cf 100755
--- a/js/controllers/color-controller.js
+++ b/js/controllers/color-controller.js
@@ -227,14 +227,14 @@ exports.ColorController = Montage.create(Component, {
                 //
                 this.fill = color;
                 //
-                if(e._event.wasSetByCode && mode !== 'nocolor') return;
+                if(e._event.wasSetByCode) return;
                 //
                 this.setColor(mode, color, true);
             } else if (input === 'stroke') {
                 //
                 this.stroke = color;
                 //
-                if(e._event.wasSetByCode && mode !== 'nocolor') return;
+                if(e._event.wasSetByCode) return;
 
                 this.setColor(mode, color, false);
             }
diff --git a/js/controllers/elements/shapes-controller.js b/js/controllers/elements/shapes-controller.js
index 68a82762..ef453bea 100755
--- a/js/controllers/elements/shapes-controller.js
+++ b/js/controllers/elements/shapes-controller.js
@@ -336,6 +336,10 @@ exports.ShapesController = Montage.create(CanvasController, {
                 color = this.getShapeProperty(el, "stroke");
             }
 
+            if(!css) {
+                return null;
+            }
+
             css = this.application.ninja.colorController.colorModel.webGlToCss(color);
             return this.application.ninja.colorController.getColorObjFromCss(css);
         }