1 files changed, 6 insertions, 7 deletions

diff --git a/js/controllers/document-controller.js b/js/controllers/document-controller.js
index 5e2a6461..df3c74f8 100755
--- a/js/controllers/document-controller.js
+++ b/js/controllers/document-controller.js
@@ -59,10 +59,7 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
             this.eventManager.addEventListener("executeNewFile", this, false);
             this.eventManager.addEventListener("executeSave", this, false);
 
-            this.eventManager.addEventListener("recordStyleChanged", this, false);
-            
-            
-            
+            this.eventManager.addEventListener("recordStyleChanged", this, false);           
         }
     },
     
@@ -119,8 +116,10 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
         //TODO: Check for appropiate structures
     handleExecuteSave: {
         value: function(event) {
-                //Text and HTML document classes should return the same save object for fileSave
-                this.application.ninja.ioMediator.fileSave(this.activeDocument.save(), this.fileSaveResult.bind(this));
+            if(!!this.activeDocument){
+                //Text and HTML document classes should return the same save object for fileSave
+                this.application.ninja.ioMediator.fileSave(this.activeDocument.save(), this.fileSaveResult.bind(this));
+            }
                 }
     },
     ////////////////////////////////////////////////////////////////////
@@ -460,5 +459,5 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
         value: function() {
             return "userDocument_" + (this._iframeCounter++);
         }
-        }
+    }
 });