diff --git a/CHANGELOG.md b/CHANGELOG.md
index a0ed96190a..f8629ea1aa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,17 @@
 # Changelog
 
+BREAKING CHANGES
+* msg.GetSignBytes() now returns bech32-encoded addresses in all cases
+
+FEATURES
+
+IMPROVEMENTS
+* export command now writes current validator set for Tendermint
+* [tests] Application module tests now use a mock application
+
+FIXES
+* [lcd] Switch to bech32 for addresses on all human readable inputs and outputs
+
 ## 0.18.0
 
 _2018-06-05_
@@ -65,7 +77,7 @@ BUG FIXES
 * query sequence via account store
 * fixed duplicate pub_key in stake.Validator
 * Auto-sequencing now works correctly
-
+* [gaiacli] Fix error message when account isn't found when running gaiacli account
 
 
 ## 0.17.5
diff --git a/x/auth/client/cli/account.go b/x/auth/client/cli/account.go
index b5af6a686a..e82b074148 100644
--- a/x/auth/client/cli/account.go
+++ b/x/auth/client/cli/account.go
@@ -52,6 +52,12 @@ func GetAccountCmd(storeName string, cdc *wire.Codec, decoder auth.AccountDecode
 				return err
 			}
 
+			// Check if account was found
+			if res == nil {
+				return sdk.ErrUnknownAddress("No account with address " + addr +
+					" was found in the state.\nAre you sure there has been a transaction involving it?")
+			}
+
 			// decode the value
 			account, err := decoder(res)
 			if err != nil {