diff --git a/src.ts/address/checks.ts b/src.ts/address/checks.ts
index 575eac844..9bac6b8a3 100644
--- a/src.ts/address/checks.ts
+++ b/src.ts/address/checks.ts
@@ -48,7 +48,7 @@ export function isAddressable(value: any): value is Addressable {
  *    isAddress("ricmoo.eth")
  *    //_result:
  */
-export function isAddress(value: any): boolean {
+export function isAddress(value: any): value is string {
     try {
         getAddress(value);
         return true;
@@ -115,7 +115,7 @@ export function resolveAddress(target: AddressLike, resolver?: null | NameResolv
     } else if (isAddressable(target)) {
         return checkAddress(target, target.getAddress());
 
-    } else if (typeof(target.then) === "function") {
+    } else if (target && typeof(target.then) === "function") {
         return checkAddress(target, target);
     }