Merge pull request #4132 from MetaMask/master

Master

2 files changed, 25 insertions, 18 deletions

diff --git a/app/scripts/background.js b/app/scripts/background.js
index 38b871bb5..69d549c85 100644
--- a/app/scripts/background.js
+++ b/app/scripts/background.js
@@ -261,7 +261,11 @@ function setupController (initState, initLangCode) {
   controller.txController.on(`tx:status-update`, (txId, status) => {
     if (status !== 'failed') return
     const txMeta = controller.txController.txStateManager.getTx(txId)
-    reportFailedTxToSentry({ raven, txMeta })
+    try {
+      reportFailedTxToSentry({ raven, txMeta })
+    } catch (e) {
+      console.error(e)
+    }
   })
 
   // setup state persistence
diff --git a/app/scripts/lib/setupRaven.js b/app/scripts/lib/setupRaven.js
index 9ec9a256f..48b941c3d 100644
--- a/app/scripts/lib/setupRaven.js
+++ b/app/scripts/lib/setupRaven.js
@@ -24,19 +24,20 @@ function setupRaven(opts) {
     transport: function(opts) {
       const report = opts.data
       // simplify certain complex error messages
-      report.exception.values.forEach(item => {
-        let errorMessage = item.value
-        // simplify ethjs error messages
-        errorMessage = extractEthjsErrorMessage(errorMessage)
-        // simplify 'Transaction Failed: known transaction'
-        if (errorMessage.indexOf('Transaction Failed: known transaction') === 0) {
-          // cut the hash from the error message
-          errorMessage = 'Transaction Failed: known transaction'
-        }
-        // finalize
-        item.value = errorMessage
-      })
-
+      if (report.exception && report.exception.values) {
+        report.exception.values.forEach(item => {
+          let errorMessage = item.value
+          // simplify ethjs error messages
+          errorMessage = extractEthjsErrorMessage(errorMessage)
+          // simplify 'Transaction Failed: known transaction'
+          if (errorMessage.indexOf('Transaction Failed: known transaction') === 0) {
+            // cut the hash from the error message
+            errorMessage = 'Transaction Failed: known transaction'
+          }
+          // finalize
+          item.value = errorMessage
+        })
+      }
       // modify report urls
       rewriteReportUrls(report)
       // make request normally
@@ -52,11 +53,13 @@ function rewriteReportUrls(report) {
   // update request url
   report.request.url = toMetamaskUrl(report.request.url)
   // update exception stack trace
-  report.exception.values.forEach(item => {
-    item.stacktrace.frames.forEach(frame => {
-      frame.filename = toMetamaskUrl(frame.filename)
+  if (report.exception && report.exception.values) {
+    report.exception.values.forEach(item => {
+      item.stacktrace.frames.forEach(frame => {
+        frame.filename = toMetamaskUrl(frame.filename)
+      })
     })
-  })
+  }
 }
 
 function toMetamaskUrl(origUrl) {