From c4e3e1e8e510aeb5ec7b19c12d09e2c7a4a33832 Mon Sep 17 00:00:00 2001
From: gorhill <rhill@raymondhill.net>
Date: Thu, 19 Nov 2015 20:19:15 -0500
Subject: [PATCH] reportedly this fixes #948

---
 platform/firefox/vapi-background.js | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/platform/firefox/vapi-background.js b/platform/firefox/vapi-background.js
index 360cc5aad..c9f970dfa 100644
--- a/platform/firefox/vapi-background.js
+++ b/platform/firefox/vapi-background.js
@@ -2240,10 +2240,7 @@ vAPI.net.registerListeners = function() {
         var browser = e.target;
 
         // I have seen this happens (at startup time)
-        // https://github.com/gorhill/uBlock/issues/948
-        //   On older version of Firefox, `browser.webNavigation` can be null,
-        //   which would cause currentURI to fail.
-        if ( !browser.webNavigation || !browser.currentURI ) {
+        if ( !browser.currentURI ) {
             return;
         }
 
@@ -3278,7 +3275,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);
         }
     },