diff --git a/renderer/lib/telemetry.js b/renderer/lib/telemetry.js
index 82a3e555..7d9203aa 100644
--- a/renderer/lib/telemetry.js
+++ b/renderer/lib/telemetry.js
@@ -123,12 +123,12 @@ function logUncaughtError (procName, err) {
   if (!telemetry) return
 
   var message, stack
-  if (typeof err === 'string') {
-    message = err
-    stack = ''
-  } else {
+  if (err instanceof Error) {
     message = err.message
     stack = err.stack
+  } else {
+    message = String(err)
+    stack = ''
   }
 
   // We need to POST the telemetry object, make sure it stays < 100kb
diff --git a/renderer/main.js b/renderer/main.js
index 2c29eaa6..6b8d48cb 100644
--- a/renderer/main.js
+++ b/renderer/main.js
@@ -109,7 +109,7 @@ function onState (err, _state) {
 
   // Log uncaught JS errors
   window.addEventListener('error',
-    (e) => telemetry.logUncaughtError('window', e.error), true)
+    (e) => telemetry.logUncaughtError('window', e.error || e.target), true)
 
   // Done! Ideally we want to get here < 500ms after the user clicks the app
   sound.play('STARTUP')