diff --git a/x/wasm/alias.go b/x/wasm/alias.go
index 762e021a4f..214fa03506 100644
--- a/x/wasm/alias.go
+++ b/x/wasm/alias.go
@@ -1,4 +1,3 @@
-//nolint
 // autogenerated code using github.com/rigelrozanski/multitool
 // aliases generated for the following subdirectories:
 // ALIASGEN: github.com/Cosmwasm/wasmd/x/wasm/types
@@ -115,7 +114,7 @@ type (
 	BankEncoder                    = keeper.BankEncoder
 	CustomEncoder                  = keeper.CustomEncoder
 	StakingEncoder                 = keeper.StakingEncoder
-	WasmEncoder                    = keeper.WasmEncoder
+	WasmEncoder                    = keeper.WasmEncoder //nolint:revive
 	MessageEncoders                = keeper.MessageEncoders
 	Keeper                         = keeper.Keeper
 	QueryHandler                   = keeper.QueryHandler
diff --git a/x/wasm/client/cli/gov_tx.go b/x/wasm/client/cli/gov_tx.go
index e2cf4a2b63..035d54a1bb 100644
--- a/x/wasm/client/cli/gov_tx.go
+++ b/x/wasm/client/cli/gov_tx.go
@@ -539,9 +539,6 @@ func ProposalUpdateContractAdminCmd() *cobra.Command {
 			}
 
 			src := parseUpdateContractAdminArgs(args, clientCtx)
-			if err != nil {
-				return err
-			}
 
 			content := types.UpdateAdminProposal{
 				Title:       proposalTitle,
diff --git a/x/wasm/client/cli/new_tx.go b/x/wasm/client/cli/new_tx.go
index e186ea97de..1e10552d45 100644
--- a/x/wasm/client/cli/new_tx.go
+++ b/x/wasm/client/cli/new_tx.go
@@ -72,9 +72,6 @@ func UpdateContractAdminCmd() *cobra.Command {
 			}
 
 			msg := parseUpdateContractAdminArgs(args, clientCtx)
-			if err != nil {
-				return err
-			}
 			if err := msg.ValidateBasic(); err != nil {
 				return err
 			}
diff --git a/x/wasm/types/query.pb.gw.go b/x/wasm/types/query.pb.gw.go
index 8a6dd28a79..32f3fd25cd 100644
--- a/x/wasm/types/query.pb.gw.go
+++ b/x/wasm/types/query.pb.gw.go
@@ -14,7 +14,7 @@ import (
 	"net/http"
 
 	"github.com/golang/protobuf/descriptor"
-	"github.com/cosmos/gogoproto/proto"
+	"github.com/golang/protobuf/proto"
 	"github.com/grpc-ecosystem/grpc-gateway/runtime"
 	"github.com/grpc-ecosystem/grpc-gateway/utilities"
 	"google.golang.org/grpc"