diff --git a/CHANGELOG.md b/CHANGELOG.md
index ef0512d68..414f1e563 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,7 +13,7 @@ at anytime.
   *
 
 ### Changed
-  *
+  * Do not catch base exception in API command resolve
   *
 
 ### Fixed
diff --git a/lbrynet/core/Wallet.py b/lbrynet/core/Wallet.py
index f2c9a9b1e..13c189e45 100644
--- a/lbrynet/core/Wallet.py
+++ b/lbrynet/core/Wallet.py
@@ -701,7 +701,7 @@ class Wallet(object):
             raise UnknownNameError("No results to return")
 
         if 'error' in results:
-            if results['error'] == 'name is not claimed':
+            if results['error'] in ['name is not claimed', 'claim not found']:
                 raise UnknownNameError(results['error'])
             else:
                 raise Exception(results['error'])
diff --git a/lbrynet/lbrynet_daemon/Daemon.py b/lbrynet/lbrynet_daemon/Daemon.py
index 095a9fbb4..1147e329c 100644
--- a/lbrynet/lbrynet_daemon/Daemon.py
+++ b/lbrynet/lbrynet_daemon/Daemon.py
@@ -1538,7 +1538,7 @@ class Daemon(AuthJSONRPCServer):
 
         try:
             resolved = yield self.session.wallet.resolve_uri(uri, check_cache=not force)
-        except Exception:
+        except UnknownNameError:
             resolved = None
         results = yield self._render_response(resolved)
         defer.returnValue(results)