Merge branch 'master' into pentool

Conflicts:
	manifest.json

1 files changed, 7 insertions, 1 deletions

diff --git a/js/mediators/keyboard-mediator.js b/js/mediators/keyboard-mediator.js
index 63cffec3..bf436593 100755
--- a/js/mediators/keyboard-mediator.js
+++ b/js/mediators/keyboard-mediator.js
@@ -214,7 +214,13 @@ exports.KeyboardMediator = Montage.create(Component, {
 
             // Check if cmd+s/ctrl+s for Save (Windows/Mac)
             if ((evt.keyCode == Keyboard.S) && (evt.ctrlKey || evt.metaKey) && !evt.shiftKey) {
-                NJevent("executeSave");
+                try{
+                    NJevent("executeSave");
+                }
+                catch(e){
+                    console.warn("Unable to save");
+                    console.log(e.stack);
+                }
                 evt.preventDefault();
                 return;
             }