diff --git a/CHANGELOG.md b/CHANGELOG.md
index 524dc9d69..6449bd387 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,7 @@ at anytime.
   *
 
 ### Fixed
+  * check `claim_address` and `change_address` earlier on publishing, to avoid hard to understand errors later in the process
   * loggly error reporting not following `share_usage_data`
   * improper error handling when data is not valid JSON
   * edge cases of http mirrored download of blobs
diff --git a/lbrynet/daemon/Daemon.py b/lbrynet/daemon/Daemon.py
index 64316c039..7732a4094 100644
--- a/lbrynet/daemon/Daemon.py
+++ b/lbrynet/daemon/Daemon.py
@@ -1734,6 +1734,11 @@ class Daemon(AuthJSONRPCServer):
         if bid <= 0.0:
             raise ValueError("Bid value must be greater than 0.0")
 
+        for address in [claim_address, change_address]:
+            if address is not None:
+                # raises an error if the address is invalid
+                decode_address(address)
+
         yield self.wallet.update_balance()
         if bid >= self.wallet.get_balance():
             balance = yield self.wallet.get_max_usable_balance_for_claim(name)