From 300968ac3420fe568ede9fd771c9898d53656c70 Mon Sep 17 00:00:00 2001
From: gorhill <rhill@raymondhill.net>
Date: Fri, 9 Oct 2015 10:37:02 -0400
Subject: [PATCH] this fixes more Thunderbird errors in console

---
 platform/firefox/vapi-background.js | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/platform/firefox/vapi-background.js b/platform/firefox/vapi-background.js
index 7038afb8f..ccbbcd88e 100644
--- a/platform/firefox/vapi-background.js
+++ b/platform/firefox/vapi-background.js
@@ -1188,14 +1188,19 @@ var tabWatcher = (function() {
 
     // Initialize map with existing active tabs
     var start = function() {
-        var tabBrowser, tab;
+        var tabBrowser, tabs, tab;
         for ( var win of vAPI.tabs.getWindows() ) {
             onWindowLoad.call(win);
             tabBrowser = getTabBrowser(win);
             if ( tabBrowser === null ) {
                 continue;
             }
-            for ( tab of tabBrowser.tabs ) {
+            // `tabBrowser.tabs` may not exist (Thunderbird).
+            tabs = tabBrowser.tabs;
+            if ( !tabs ) {
+                continue;
+            }
+            for ( tab of tabs ) {
                 if ( vAPI.fennec || !tab.hasAttribute('pending') ) {
                     tabIdFromTarget(tab);
                 }
@@ -2879,6 +2884,12 @@ vAPI.contextMenu.register = function(doc) {
     }
 
     var contextMenu = doc.getElementById('contentAreaContextMenu');
+
+    // This can happen (Thunderbird).
+    if ( contextMenu === null ) {
+        return;
+    }
+
     var menuitem = doc.createElement('menuitem');
     menuitem.setAttribute('id', this.menuItemId);
     menuitem.setAttribute('label', this.menuLabel);