From d77838d3a23060fadda95bb541dbb00f502951b1 Mon Sep 17 00:00:00 2001
From: Daniel McNally <mcnallydp@gmail.com>
Date: Fri, 20 Oct 2017 11:50:04 -0400
Subject: [PATCH 1/2] Catch 'not found' error in getAddressesByAccount

---
 lib/wallet/rpc.js | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/lib/wallet/rpc.js b/lib/wallet/rpc.js
index bfb67df2..aef5fea3 100644
--- a/lib/wallet/rpc.js
+++ b/lib/wallet/rpc.js
@@ -372,11 +372,17 @@ RPC.prototype.getAddressesByAccount = async function getAddressesByAccount(args,
   if (name === '')
     name = 'default';
 
-  const paths = await wallet.getPaths(name);
+  try {
+    const paths = await wallet.getPaths(name);
 
-  for (const path of paths) {
-    const addr = path.toAddress();
-    addrs.push(addr.toString(this.network));
+    for (const path of paths) {
+      const addr = path.toAddress();
+      addrs.push(addr.toString(this.network));
+    }
+  } catch(err) {
+    if(err.message !== 'Account not found.') {
+      throw err;
+    }
   }
 
   return addrs;

From b9b4e5f18278d11e6f1882441e9bf5ccf4a26114 Mon Sep 17 00:00:00 2001
From: Daniel McNally <mcnallydp@gmail.com>
Date: Fri, 20 Oct 2017 21:49:31 -0400
Subject: [PATCH 2/2] Catch 'already exists' error in importAddress

---
 lib/wallet/rpc.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/lib/wallet/rpc.js b/lib/wallet/rpc.js
index aef5fea3..37e2d0d7 100644
--- a/lib/wallet/rpc.js
+++ b/lib/wallet/rpc.js
@@ -756,7 +756,12 @@ RPC.prototype.importAddress = async function importAddress(args, help) {
     addr = parseAddress(addr, this.network);
   }
 
-  await wallet.importAddress(0, addr);
+  try {
+    await wallet.importAddress(0, addr);
+  } catch (err) {
+    if (err.message !== 'Address already exists.')
+      throw err;
+  }
 
   if (rescan)
     await this.wdb.rescan(0);