Merge branch 'refs/heads/Ninja-Internal' into Color

1 files changed, 6 insertions, 4 deletions

diff --git a/js/tools/PenTool.js b/js/tools/PenTool.js
index 33ca5c71..2cffb44d 100755
--- a/js/tools/PenTool.js
+++ b/js/tools/PenTool.js
@@ -204,10 +204,12 @@ exports.PenTool = Montage.create(ShapeTool, {
             this.application.ninja.stage.clearDrawingCanvas();//stageManagerModule.stageManager.clearDrawingCanvas();
 
             //undo/redo...go through ElementController and NJEvent
-            var els = [];
-            ElementController.removeElement(this._selectedSubpathCanvas);
-            els.push(this._selectedSubpathCanvas);
-            NJevent( "elementsRemoved", els );
+            if (this._selectedSubpathCanvas) {
+                var els = [];
+                ElementController.removeElement(this._selectedSubpathCanvas);
+                els.push(this._selectedSubpathCanvas);
+                NJevent( "elementsRemoved", els );
+            }
             this._selectedSubpathCanvas = null;
         }
     },