1 files changed, 10 insertions, 1 deletions

diff --git a/js/controllers/elements/shapes-controller.js b/js/controllers/elements/shapes-controller.js
index d1bc1fb7..514b1472 100755
--- a/js/controllers/elements/shapes-controller.js
+++ b/js/controllers/elements/shapes-controller.js
@@ -386,7 +386,16 @@ exports.ShapesController = Montage.create(CanvasController, {
         value: function(el, isFill) {
             if(isFill)
             {
-                return this.application.ninja.colorController.colorModel.webGlToColor(el.elementModel.shapeModel.GLGeomObj.getFillColor());
+                // Properties Panel asks for fill color even for shapes that only have strokes
+                // Check that shape object has a getFillColor method before getting fills
+                if(el.elementModel.shapeModel.GLGeomObj.getFillColor)
+                {
+                    return this.application.ninja.colorController.colorModel.webGlToColor(el.elementModel.shapeModel.GLGeomObj.getFillColor());
+                }
+                else
+                {
+                    return null;
+                }
             }
             else
             {