1 files changed, 5 insertions, 3 deletions

diff --git a/js/components/layout/document-entry.reel/document-entry.js b/js/components/layout/document-entry.reel/document-entry.js
index 81a63c90..ad0236c6 100755
--- a/js/components/layout/document-entry.reel/document-entry.js
+++ b/js/components/layout/document-entry.reel/document-entry.js
@@ -33,8 +33,10 @@ exports.DocumentEntry = Montage.create(Component, {
             }
 
             this._document = value;
-            this._uuid = value.uuid;
-            //this.needsDraw = true;
+
+            if(value) {
+                this._uuid = value.uuid;
+            }
         }
     },
 
@@ -117,7 +119,7 @@ exports.DocumentEntry = Montage.create(Component, {
     handleClick: {
         value: function(event) {
             if(event._event.target.nodeName === "IMG") {
-                this.application.ninja.documentController.closeDocument(this._uuid);
+                this.application.ninja.documentController.closeFile(this.application.ninja.documentController._findDocumentByUUID(this._uuid));
             } else {
                 if(!this._document.isActive) {
                     this.application.ninja.stage.stageView.switchDocument(this.application.ninja.documentController._findDocumentByUUID(this._uuid));