From 7c3251fa26c0f723ced882bcf63fcac75d0d1573 Mon Sep 17 00:00:00 2001
From: Tony Stark <ironman0x7b2@protonmail.com>
Date: Fri, 1 Mar 2019 08:49:18 +0530
Subject: [PATCH] Added a condition in querier

---
 client/context/query.go |  2 --
 x/auth/querier.go       |  3 +++
 x/auth/querier_test.go  | 10 +++++-----
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/client/context/query.go b/client/context/query.go
index 3bf67c76b5..7f625e801e 100644
--- a/client/context/query.go
+++ b/client/context/query.go
@@ -139,8 +139,6 @@ func (ctx CLIContext) queryAccount(addr sdk.AccAddress) ([]byte, error) {
 	res, err := ctx.QueryWithData(route, bz)
 	if err != nil {
 		return nil, err
-	} else if len(res) == 4 && string(res) == "null" {
-		return nil, ErrInvalidAccount(addr)
 	}
 
 	return res, nil
diff --git a/x/auth/querier.go b/x/auth/querier.go
index 5b40bcbf38..2a5dbf422a 100644
--- a/x/auth/querier.go
+++ b/x/auth/querier.go
@@ -44,6 +44,9 @@ func queryAccount(ctx sdk.Context, req abci.RequestQuery, keeper AccountKeeper)
 	}
 
 	account := keeper.GetAccount(ctx, params.Address)
+	if account == nil {
+		return nil, sdk.ErrUnknownAddress(fmt.Sprintf("account %s does not exist", params.Address))
+	}
 
 	bz, err := codec.MarshalJSONIndent(keeper.cdc, account)
 	if err != nil {
diff --git a/x/auth/querier_test.go b/x/auth/querier_test.go
index 3eb632e1bd..6d9ec0e963 100644
--- a/x/auth/querier_test.go
+++ b/x/auth/querier_test.go
@@ -21,19 +21,19 @@ func Test_queryAccount(t *testing.T) {
 
 	req.Data = input.cdc.MustMarshalJSON(NewQueryAccountParams([]byte("")))
 	res, err = queryAccount(input.ctx, req, input.ak)
-	require.Nil(t, err)
-	require.Equal(t, res, []byte("null"))
+	require.NotNil(t, err)
+	require.Nil(t, res)
 
 	_, _, addr := keyPubAddr()
 	req.Data = input.cdc.MustMarshalJSON(NewQueryAccountParams(addr))
 	res, err = queryAccount(input.ctx, req, input.ak)
-	require.Nil(t, err)
-	require.Equal(t, res, []byte("null"))
+	require.NotNil(t, err)
+	require.Nil(t, res)
 
 	input.ak.SetAccount(input.ctx, input.ak.NewAccountWithAddress(input.ctx, addr))
 	res, err = queryAccount(input.ctx, req, input.ak)
 	require.Nil(t, err)
-	require.NotEqual(t, res, []byte("null"))
+	require.NotNil(t, res)
 
 	var account Account
 	err2 := input.cdc.UnmarshalJSON(res, &account)