diff --git a/js/conversation_panel.js b/js/conversation_panel.js index 2083689fe..4d99d0647 100644 --- a/js/conversation_panel.js +++ b/js/conversation_panel.js @@ -22,9 +22,13 @@ extension.windows.getCurrent(function (windowInfo) { var bg = extension.windows.getBackground(); var conversation = bg.getConversationForWindow(windowInfo.id); - window.document.title = conversation.getTitle(); - new Whisper.ConversationView({ - model: conversation - }).$el.prependTo($('body')); + if (conversation) { + window.document.title = conversation.getTitle(); + new Whisper.ConversationView({ + model: conversation + }).$el.prependTo($('body')); + } else { + $('