diff --git a/platform/firefox/vapi-background.js b/platform/firefox/vapi-background.js index 3d73648b5..647c4c407 100644 --- a/platform/firefox/vapi-background.js +++ b/platform/firefox/vapi-background.js @@ -908,6 +908,12 @@ var tabWatcher = (function() { var currentBrowser = function() { var win = Services.wm.getMostRecentWindow('navigator:browser'); + // https://github.com/gorhill/uBlock/issues/399 + // getTabBrowser() can return null at browser launch time. + var tabBrowser = getTabBrowser(win); + if ( tabBrowser === null ) { + return null; + } return browserFromTarget(getTabBrowser(win).selectedTab); };