diff --git a/platform/firefox/vapi-background.js b/platform/firefox/vapi-background.js index 360cc5aad..c7c7be0a1 100644 --- a/platform/firefox/vapi-background.js +++ b/platform/firefox/vapi-background.js @@ -3278,7 +3278,19 @@ var optionsObserver = { cleanupTasks.push(this.unregister.bind(this)); var browser = tabWatcher.currentBrowser(); - if ( browser && browser.currentURI && browser.currentURI.spec === 'about:addons' ) { + if ( !browser ) { + return; + } + + // https://github.com/gorhill/uBlock/issues/948 + // Older versions of Firefox can throw here when looking up `currentURI`. + var currentURI; + try { + currentURI = browser.currentURI; + } catch (ex) { + } + + if ( currentURI && currentURI.spec === 'about:addons' ) { this.observe(browser.contentDocument, 'addon-enabled', this.addonId); } },