diff --git a/mobile/android/base/health/BrowserHealthRecorder.java b/mobile/android/base/health/BrowserHealthRecorder.java
index 0c0bc7e9b15d..225d0b277d03 100644
--- a/mobile/android/base/health/BrowserHealthRecorder.java
+++ b/mobile/android/base/health/BrowserHealthRecorder.java
@@ -564,7 +564,7 @@ public class BrowserHealthRecorder implements GeckoEventListener {
                                  PREF_BLOCKLIST_ENABLED
                              },
                              handler);
-        Log.d(LOG_TAG, "Done initializing profile cache. Beginning storage init.");
+        Log.d(LOG_TAG, "Requested prefs.");
     }
 
     @Override
@@ -574,7 +574,7 @@ public class BrowserHealthRecorder implements GeckoEventListener {
                 Log.d(LOG_TAG, "Got all add-ons.");
                 try {
                     JSONObject addons = message.getJSONObject("json");
-                    Log.d(LOG_TAG, "Persisting " + addons.length() + " add-ons.");
+                    Log.i(LOG_TAG, "Persisting " + addons.length() + " add-ons.");
                     profileCache.setJSONForAddons(addons);
                     profileCache.completeInitialization();
                 } catch (java.io.IOException e) {
diff --git a/mobile/android/chrome/content/browser.js b/mobile/android/chrome/content/browser.js
index d98131a360bb..e201303979fb 100644
--- a/mobile/android/chrome/content/browser.js
+++ b/mobile/android/chrome/content/browser.js
@@ -5238,11 +5238,15 @@ let HealthReportStatusListener = {
         if (aAddons) {
           for (let i = 0; i < aAddons.length; ++i) {
             let addon = aAddons[i];
-            let addonJSON = HealthReportStatusListener.jsonForAddon(addon);
-            if (HealthReportStatusListener._shouldIgnore(addon)) {
-              addonJSON.ignore = true;
+            try {
+              let addonJSON = HealthReportStatusListener.jsonForAddon(addon);
+              if (HealthReportStatusListener._shouldIgnore(addon)) {
+                addonJSON.ignore = true;
+              }
+              json[addon.id] = addonJSON;
+            } catch (e) {
+              // Just skip this add-on.
             }
-            json[addon.id] = addonJSON;
           }
         }
         sendMessageToJava({ type: "Addons:All", json: json });