1 files changed, 11 insertions, 6 deletions
diff --git a/toolkit/modules/Troubleshoot.jsm b/toolkit/modules/Troubleshoot.jsm
index 20aad6770..a862b1db4 100644
--- a/toolkit/modules/Troubleshoot.jsm
+++ b/toolkit/modules/Troubleshoot.jsm
@@ -347,11 +347,14 @@ var dataProviders = {
                    QueryInterface(Ci.nsIInterfaceRequestor).
                    getInterface(Ci.nsIDOMWindowUtils)
     data.supportsHardwareH264 = "Unknown";
-    let promise = winUtils.supportsHardwareH264Decoding;
-    promise.then(function(v) {
-      data.supportsHardwareH264 = v;
-    });
-    promises.push(promise);
+    try {
+      // After restart - data may not be available
+      let promise = winUtils.supportsHardwareH264Decoding;
+      promise.then(function(v) {
+        data.supportsHardwareH264 = v;
+      });
+      promises.push(promise);
+    } catch (e) {}
 
     data.currentAudioBackend = winUtils.currentAudioBackend;
 
@@ -457,7 +460,9 @@ var dataProviders = {
 
         // Eagerly free resources.
         let loseExt = gl.getExtension("WEBGL_lose_context");
-        loseExt.loseContext();
+        if (loseExt) {
+          loseExt.loseContext();
+        }
 
 
         return contextInfo;