From f2b38874ef04d22d2c93c737d78f62e8673e59b3 Mon Sep 17 00:00:00 2001
From: Alessio Treglia <alessio@tendermint.com>
Date: Fri, 16 Nov 2018 05:01:34 +0000
Subject: [PATCH 1/2] Check whether key passed with --name exists before
 redirecting to tx create-validator

Closes: #2804
---
 cmd/gaia/init/gentx.go | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/cmd/gaia/init/gentx.go b/cmd/gaia/init/gentx.go
index 449eb2b85b..6d66f2e306 100644
--- a/cmd/gaia/init/gentx.go
+++ b/cmd/gaia/init/gentx.go
@@ -3,6 +3,7 @@ package init
 import (
 	"fmt"
 	"github.com/cosmos/cosmos-sdk/client"
+	"github.com/cosmos/cosmos-sdk/client/keys"
 	"github.com/cosmos/cosmos-sdk/cmd/gaia/app"
 	"github.com/cosmos/cosmos-sdk/codec"
 	"github.com/cosmos/cosmos-sdk/server"
@@ -61,6 +62,14 @@ following delegation and commission default parameters:
 				return err
 			}
 
+			kb, err := keys.GetKeyBaseFromDir(viper.GetString(flagClientHome))
+			if err != nil {
+				return err
+			}
+			if _, err = kb.Get(viper.GetString(client.FlagName)); err != nil {
+				return err
+			}
+
 			// Read --pubkey, if empty take it from priv_validator.json
 			if valPubKeyString := viper.GetString(cli.FlagPubKey); valPubKeyString != "" {
 				valPubKey, err = sdk.GetConsPubKeyBech32(valPubKeyString)

From 9beb6d405e9c3d8ac752e74973236d0d546407a3 Mon Sep 17 00:00:00 2001
From: Alessio Treglia <alessio@tendermint.com>
Date: Fri, 16 Nov 2018 05:05:20 +0000
Subject: [PATCH 2/2] Update PENDING.md

---
 PENDING.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/PENDING.md b/PENDING.md
index 74395be2d5..f58a8f5438 100644
--- a/PENDING.md
+++ b/PENDING.md
@@ -8,6 +8,7 @@ BREAKING CHANGES
   * [cli] [\#2728](https://github.com/cosmos/cosmos-sdk/pull/2728) Seperate `tx` and `query` subcommands by module
   * [cli] [\#2727](https://github.com/cosmos/cosmos-sdk/pull/2727) Fix unbonding command flow
   * [cli] [\#2786](https://github.com/cosmos/cosmos-sdk/pull/2786) Fix redelegation command flow
+  * [cli] [\#2804](https://github.com/cosmos/cosmos-sdk/issues/2804) Check whether key exists before passing it on to `tx create-validator`.
 
 * Gaia