diff --git a/js/models/core/Wallet.js b/js/models/core/Wallet.js
index 69cb7ab2e..a2ed268e2 100644
--- a/js/models/core/Wallet.js
+++ b/js/models/core/Wallet.js
@@ -166,7 +166,7 @@ Wallet.prototype.toObj = function() {
   var optsObj = this._optsToObj();
   var walletObj = {
     opts: optsObj,
-    publicKeyring: this.publicKeyRing.toObj(),
+    publicKeyRing: this.publicKeyRing.toObj(),
     txProposals: this.txProposals.toObj(),
     privateKey: this.privateKey.toObj()
   };
diff --git a/js/models/core/WalletFactory.js b/js/models/core/WalletFactory.js
index bd87ec1fd..2facf3b88 100644
--- a/js/models/core/WalletFactory.js
+++ b/js/models/core/WalletFactory.js
@@ -48,11 +48,13 @@ WalletFactory.prototype._checkRead = function(walletId) {
 };
 
 WalletFactory.prototype.read = function(walletId) {
-  if (! this._checkRead(walletId)) return false;
+  if (! this._checkRead(walletId))
+    throw Error('Check read failed');
 
   var s = this.storage;
   var opts = s.get(walletId, 'opts');
 
+  opts.id = walletId;
   opts.publicKeyRing = new PublicKeyRing.fromObj(s.get(walletId, 'publicKeyRing'));
   opts.txProposals   = new TxProposals.fromObj(s.get(walletId, 'txProposals'));
   opts.privateKey    = new PrivateKey.fromObj(s.get(walletId, 'privateKey'));
diff --git a/test/mocks/FakeStorage.js b/test/mocks/FakeStorage.js
index 5819905e5..5ab31ef54 100644
--- a/test/mocks/FakeStorage.js
+++ b/test/mocks/FakeStorage.js
@@ -27,4 +27,10 @@ FakeStorage.prototype.getWalletIds = function() {
   return [];
 };
 
+FakeStorage.prototype.setFromObj = function(walletId, obj) {
+  for (var i in obj) {
+    this.storage[walletId + '-' + i] = obj[i];
+  };
+};
+
 module.exports = require('soop')(FakeStorage);