1 files changed, 14 insertions, 2 deletions

diff --git a/js/controllers/clipboard-controller.js b/js/controllers/clipboard-controller.js
index 5e63e424..129e1f89 100644
--- a/js/controllers/clipboard-controller.js
+++ b/js/controllers/clipboard-controller.js
@@ -133,8 +133,20 @@ var ClipboardController = exports.ClipboardController = Montage.create(Component
             this.pasteCounter++;
 
             if(ninjaData){
-                if(this.copiedObjects.copy){this.pasteFromCopy();}
-                else if(this.copiedObjects.cut){this.pasteFromCut();}
+                if(this.copiedObjects.copy){
+                    try{
+                        this.pasteFromCopy();
+                    }catch(e){
+                        console.log(""+e.stack);
+                    }
+                }
+                else if(this.copiedObjects.cut){
+                    try{
+                        this.pasteFromCut();
+                    }catch(e){
+                        console.log(""+e.stack);
+                    }
+                }
             }
             else{