Rebase fixes

IPython/html/static/components

@@ -1,1 +1,1 b''
-Subproject commit 87ff70d96567bf055eb94161a41e7b3e6da31b23
+Subproject commit 563c9e74b153e9509d94fd448353eeda13f0819c

IPython/html/static/widgets/js/manager.js

@@ -94,7 +94,7 b' define(['
                 " message was from.  Widget will not be displayed"));
         } else {
             return this.display_view_in_cell(cell, model)
-                .catch(utils.reject('View could not be displayed.', true)); 
+                .catch(utils.reject('Could not display view', true)); 
         }
     };
 

IPython/html/static/widgets/js/widget.js

@@ -137,14 +137,14 b' define(["widgets/js/manager",'
                                 that._resolve_received_state[parent_id].call();
                                 delete that._resolve_received_state[parent_id];
                             }
-                        }).catch(utils.reject("Couldn't resolve state request promise.", true));
+                        }).catch(utils.reject("Couldn't resolve state request promise", true));
                     break;
                 case 'custom':
                     this.trigger('msg:custom', msg.content.data.content);
                     break;
                 case 'display':
                     this.widget_manager.display_view(msg, this)
-                    .catch(utils.reject('Could not display view.', true));
+                        .catch(utils.reject('Could not process display view msg', true));
                     break;
             }
         },
@@ -159,7 +159,7 b' define(["widgets/js/manager",'
                 } finally {
                     that.state_lock = null;
                 }
-            }, utils.reject("Couldn't set model state", true));
+            }).catch(utils.reject("Couldn't set model state", true));
         },
 
         get_state: function() {