diff --git a/js/models/Identity.js b/js/models/Identity.js
index 110e17553..0ea694285 100644
--- a/js/models/Identity.js
+++ b/js/models/Identity.js
@@ -650,6 +650,9 @@ Identity.prototype.joinWallet = function(opts, cb) {
               err = 'walletFull';
             }
           }
+          if (err)
+            return cb(err);
+
           self.store({
             noWallets: true
           }, function(err) {
diff --git a/test/Identity.js b/test/Identity.js
index 9b3690d43..ca14e2b39 100644
--- a/test/Identity.js
+++ b/test/Identity.js
@@ -370,7 +370,7 @@ describe('Identity model', function() {
       net.start.onFirstCall().callsArg(1);
       net.greet = sinon.stub();
       iden.createWallet = sinon.stub();
-      iden.createWallet.onFirstCall().yields();
+      iden.createWallet.onFirstCall().yields(null,null);
       net.on.withArgs('data').yields('senderId', {
         type: 'walletId',
         networkName: 'testnet',