diff --git a/x/wasm/client/cli/genesis_msg.go b/x/wasm/client/cli/genesis_msg.go
index a8a6ae1328..8aedae358a 100644
--- a/x/wasm/client/cli/genesis_msg.go
+++ b/x/wasm/client/cli/genesis_msg.go
@@ -74,6 +74,7 @@ func GenesisStoreCodeCmd(defaultNodeHome string, genesisMutator GenesisMutator)
 	cmd.Flags().String(flagInstantiateNobody, "", "Nobody except the governance process can instantiate a contract from the code, optional")
 	cmd.Flags().String(flagInstantiateByAddress, "", "Only this address can instantiate a contract instance from the code, optional")
 	cmd.Flags().StringSlice(flagInstantiateByAnyOfAddress, []string{}, "Any of the addresses can instantiate a contract from the code, optional")
+
 	cmd.Flags().String(flags.FlagHome, defaultNodeHome, "The application home directory")
 	cmd.Flags().String(flags.FlagKeyringBackend, flags.DefaultKeyringBackend, "Select keyring's backend (os|file|kwallet|pass|test)")
 	flags.AddQueryFlagsToCmd(cmd)
diff --git a/x/wasm/client/cli/gov_tx.go b/x/wasm/client/cli/gov_tx.go
index f1401ea9d6..66584ae57f 100644
--- a/x/wasm/client/cli/gov_tx.go
+++ b/x/wasm/client/cli/gov_tx.go
@@ -99,7 +99,7 @@ func ProposalStoreCodeCmd() *cobra.Command {
 	cmd.Flags().String(flagInstantiateNobody, "", "Nobody except the governance process can instantiate a contract from the code, optional")
 	cmd.Flags().String(flagInstantiateByAddress, "", "Only this address can instantiate a contract instance from the code, optional")
 	cmd.Flags().Bool(flagUnpinCode, false, "Unpin code on upload, optional")
-	cmd.Flags().String(flagSource, "", "Source is a valid absolute HTTPS URI to the contract's source code,")
+	cmd.Flags().String(flagSource, "", "Code Source URL is a valid absolute HTTPS URI to the contract's source code,")
 	cmd.Flags().String(flagBuilder, "", "Builder is a valid docker image name with tag, such as \"cosmwasm/workspace-optimizer:0.12.9\"")
 	cmd.Flags().BytesHex(flagCodeHash, []byte{}, "CodeHash is the sha256 hash of the wasm code")
 
diff --git a/x/wasm/client/proposal_handler_test.go b/x/wasm/client/proposal_handler_test.go
index f9e888b7f0..c1dc02d7a3 100644
--- a/x/wasm/client/proposal_handler_test.go
+++ b/x/wasm/client/proposal_handler_test.go
@@ -62,7 +62,7 @@ func TestGovRestHandlers(t *testing.T) {
 				"run_as":         "cosmos100dejzacpanrldpjjwksjm62shqhyss44jf5xz",
 				"wasm_byte_code": []byte("valid wasm byte code"),
 				"source":         "https://example.com/",
-				"builder":        "cosmwasm/workspace-optimizer:v0.12.8",
+				"builder":        "cosmwasm/workspace-optimizer:v0.12.9",
 				"code_hash":      "2badc56e12711c6387b3b7f9842f1e17a244f5fe354900920362f6668f266125",
 				"instantiate_permission": dict{
 					"permission": "OnlyAddress",
@@ -83,7 +83,7 @@ func TestGovRestHandlers(t *testing.T) {
 				"run_as":         "cosmos100dejzacpanrldpjjwksjm62shqhyss44jf5xz",
 				"wasm_byte_code": []byte("valid wasm byte code"),
 				"source":         "https://example.com/",
-				"builder":        "cosmwasm/workspace-optimizer:v0.12.8",
+				"builder":        "cosmwasm/workspace-optimizer:v0.12.9",
 				"code_hash":      "2badc56e12711c6387b3b7f9842f1e17a244f5fe354900920362f6668f266125",
 				"deposit":        []dict{{"denom": "ustake", "amount": "10"}},
 				"proposer":       "cosmos1ve557a5g9yw2g2z57js3pdmcvd5my6g8ze20np",
@@ -100,7 +100,7 @@ func TestGovRestHandlers(t *testing.T) {
 				"run_as":         "cosmos100dejzacpanrldpjjwksjm62shqhyss44jf5xz",
 				"wasm_byte_code": []byte("valid wasm byte code"),
 				"source":         "https://example.com/",
-				"builder":        "cosmwasm/workspace-optimizer:v0.12.8",
+				"builder":        "cosmwasm/workspace-optimizer:v0.12.9",
 				"code_hash":      "2badc56e12711c6387b3b7f9842f1e17a244f5fe354900920362f6668f266125",
 				"instantiate_permission": dict{
 					"permission": "Nobody",
@@ -122,7 +122,7 @@ func TestGovRestHandlers(t *testing.T) {
 				"wasm_byte_code": []byte("valid wasm byte code"),
 				"source":         "https://example.com/",
 				"code_hash":      "2badc56e12711c6387b3b7f9842f1e17a244f5fe354900920362f6668f266125",
-				"builder":        "cosmwasm/workspace-optimizer:v0.12.8",
+				"builder":        "cosmwasm/workspace-optimizer:v0.12.9",
 				"instantiate_permission": dict{
 					"permission": "OnlyAddress",
 					"address":    "cosmos1ve557a5g9yw2g2z57js3pdmcvd5my6g8ze20np",
@@ -141,7 +141,7 @@ func TestGovRestHandlers(t *testing.T) {
 				"type":           "store-code",
 				"run_as":         "cosmos100dejzacpanrldpjjwksjm62shqhyss44jf5xz",
 				"wasm_byte_code": "",
-				"builder":        "cosmwasm/workspace-optimizer:v0.12.8",
+				"builder":        "cosmwasm/workspace-optimizer:v0.12.9",
 				"source":         "https://example.com/",
 				"code_hash":      "2badc56e12711c6387b3b7f9842f1e17a244f5fe354900920362f6668f266125",
 				"instantiate_permission": dict{
@@ -182,7 +182,7 @@ func TestGovRestHandlers(t *testing.T) {
 				"type":           "store-code",
 				"run_as":         "cosmos100dejzacpanrldpjjwksjm62shqhyss44jf5xz",
 				"wasm_byte_code": "",
-				"builder":        "cosmwasm/workspace-optimizer:v0.12.8",
+				"builder":        "cosmwasm/workspace-optimizer:v0.12.9",
 				"source":         "https://example.com/",
 				"instantiate_permission": dict{
 					"permission": "OnlyAddress",
@@ -202,7 +202,7 @@ func TestGovRestHandlers(t *testing.T) {
 				"type":           "store-code",
 				"run_as":         "cosmos100dejzacpanrldpjjwksjm62shqhyss44jf5xz",
 				"wasm_byte_code": "",
-				"builder":        "cosmwasm/workspace-optimizer:v0.12.8",
+				"builder":        "cosmwasm/workspace-optimizer:v0.12.9",
 				"instantiate_permission": dict{
 					"permission": "OnlyAddress",
 					"address":    "cosmos1ve557a5g9yw2g2z57js3pdmcvd5my6g8ze20np",
diff --git a/x/wasm/keeper/proposal_integration_test.go b/x/wasm/keeper/proposal_integration_test.go
index 79000b6f49..5a0305a485 100644
--- a/x/wasm/keeper/proposal_integration_test.go
+++ b/x/wasm/keeper/proposal_integration_test.go
@@ -55,6 +55,7 @@ func TestStoreCodeProposal(t *testing.T) {
 
 			// when stored
 			storedProposal, err := govKeeper.SubmitProposal(ctx, src)
+			require.NoError(t, err)
 
 			// and proposal execute
 			handler := govKeeper.Router().GetRoute(storedProposal.ProposalRoute())