Merge branch 'master' into FrankieDisclaimer

1 files changed, 7 insertions, 1 deletions

diff --git a/ui/app/info.js b/ui/app/info.js
index a473f5921..d97998fd7 100644
--- a/ui/app/info.js
+++ b/ui/app/info.js
@@ -17,7 +17,13 @@ function InfoScreen () {
 
 InfoScreen.prototype.render = function () {
   var state = this.props
-  var manifest = chrome.runtime.getManifest()
+  var manifest
+  try {
+    manifest = chrome.runtime.getManifest()
+  } catch (e) {
+    manifest = { version: '2.0.0' }
+  }
+
   return (
     h('.flex-column.flex-grow', [