From 05c820074905efea00e61aa42243d8e8caf3a4a2 Mon Sep 17 00:00:00 2001
From: Matias Pando <mpando@bitpay.com>
Date: Mon, 17 Nov 2014 17:44:38 -0300
Subject: [PATCH] Add error checking when importing a wallet from a corrupt
 file

---
 js/models/Wallet.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/js/models/Wallet.js b/js/models/Wallet.js
index 2aedd8819..debb6b82a 100644
--- a/js/models/Wallet.js
+++ b/js/models/Wallet.js
@@ -1035,8 +1035,12 @@ Wallet.fromObj = function(o, readOpts) {
   // TODO Why moving everything to opts. This needs refactoring.
   //
   // clone opts
-  var opts = JSON.parse(JSON.stringify(o.opts));
 
+  if (!o.opts) {
+    return null;
+  }
+
+  var opts = JSON.parse(JSON.stringify(o.opts));
   opts.addressBook = o.addressBook;
   opts.settings = o.settings;