Merge branch 'refs/heads/ninja-internal-master' into FileIO

Conflicts:
	js/controllers/selection-controller.js
	js/document/html-document.js
	js/panels/properties/content.reel/content.js

Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>

1 files changed, 4 insertions, 1 deletions

diff --git a/js/tools/LineTool.js b/js/tools/LineTool.js
index 233316a5..0a7c0534 100755
--- a/js/tools/LineTool.js
+++ b/js/tools/LineTool.js
@@ -42,7 +42,10 @@ exports.LineTool = Montage.create(ShapeTool, {
             }
 
             this._strokeSize = ShapesController.GetValueInPixels(this.options.strokeSize.value, this.options.strokeSize.units, null);
-            this._strokeColor = this.application.ninja.colorController.colorToolbar.stroke.color.css;
+                        if (this.application.ninja.colorController.colorToolbar.stroke.color)
+                                this._strokeColor = this.application.ninja.colorController.colorToolbar.stroke.color.css;
+                        else
+                                this._strokeColor = [0,0,0,1];
             this.startDraw(event);
         }
     },