diff --git a/PENDING.md b/PENDING.md
index 623dba04f1b9..c4a96375250c 100644
--- a/PENDING.md
+++ b/PENDING.md
@@ -71,7 +71,8 @@ BUG FIXES
 * Gaia REST API (`gaiacli advanced rest-server`)
 
 * Gaia CLI  (`gaiacli`)
-
+  * \#3141 Fix the bug in GetAccount when `len(res) == 0` and `err == nil`
+  
 * Gaia
   * \#3148 Fix `gaiad export` by adding a boolean to `NewGaiaApp` determining whether or not to load the latest version
   * \#3181 Correctly reset total accum update height and jailed-validator bond height / unbonding height on export-for-zero-height
diff --git a/client/context/query.go b/client/context/query.go
index 0eff95d30bab..aba8df19095e 100644
--- a/client/context/query.go
+++ b/client/context/query.go
@@ -70,7 +70,7 @@ func (ctx CLIContext) GetAccount(address []byte) (auth.Account, error) {
 	if err != nil {
 		return nil, err
 	} else if len(res) == 0 {
-		return nil, err
+		return nil, ErrInvalidAccount(address)
 	}
 
 	account, err := ctx.AccDecoder(res)