diff --git a/lib/wallet/rpc.js b/lib/wallet/rpc.js index 36620d6b..564dc436 100644 --- a/lib/wallet/rpc.js +++ b/lib/wallet/rpc.js @@ -429,7 +429,14 @@ class RPC extends RPCBase { if (name === '') name = 'default'; - const paths = await wallet.getPaths(name); + let paths; + try { + paths = await wallet.getPaths(name); + } catch (e) { + if (e.message === 'Account not found.') + return []; + throw e; + } for (const path of paths) { const addr = path.toAddress(); @@ -813,7 +820,12 @@ class RPC extends RPCBase { addr = parseAddress(addr, this.network); } - await wallet.importAddress(0, addr); + try { + await wallet.importAddress(0, addr); + } catch (e) { + if (e.message !== 'Address already exists.') + throw e; + } if (rescan) await this.wdb.rescan(0);