diff --git a/lcd_test/helpers.go b/lcd_test/helpers.go
index 237df8cf0ee..7431f4d0dba 100644
--- a/lcd_test/helpers.go
+++ b/lcd_test/helpers.go
@@ -382,6 +382,9 @@ func CreateAddr(name string, kb crkeys.Keybase) (sdk.AccAddress, string, error)
 		seed string
 	)
 	info, seed, err = kb.CreateMnemonic(name, crkeys.English, keys.DefaultKeyPass, crkeys.Secp256k1)
+	if err != nil {
+		return nil, "", err
+	}
 	return sdk.AccAddress(info.GetPubKey().Address()), seed, err
 }
 
diff --git a/x/wasm/client/rest/new_tx.go b/x/wasm/client/rest/new_tx.go
index 977f310314d..7df5a310e32 100644
--- a/x/wasm/client/rest/new_tx.go
+++ b/x/wasm/client/rest/new_tx.go
@@ -19,7 +19,7 @@ func registerNewTxRoutes(cliCtx context.CLIContext, r *mux.Router) {
 type migrateContractReq struct {
 	BaseReq    rest.BaseReq   `json:"base_req" yaml:"base_req"`
 	Admin      sdk.AccAddress `json:"admin,omitempty" yaml:"admin"`
-	codeID     uint64         `json:"code_id" yaml:"code_id"`
+	CodeID     uint64         `json:"code_id" yaml:"code_id"`
 	MigrateMsg []byte         `json:"migrate_msg,omitempty" yaml:"migrate_msg"`
 }
 type updateContractAdministrateReq struct {
@@ -84,7 +84,7 @@ func migrateContractHandlerFn(cliCtx context.CLIContext) http.HandlerFunc {
 		msg := types.MsgMigrateContract{
 			Sender:     cliCtx.GetFromAddress(),
 			Contract:   contractAddress,
-			Code:       req.codeID,
+			Code:       req.CodeID,
 			MigrateMsg: req.MigrateMsg,
 		}
 		if err = msg.ValidateBasic(); err != nil {
diff --git a/x/wasm/internal/keeper/keeper.go b/x/wasm/internal/keeper/keeper.go
index 774a6745ba5..a60c61ccc3b 100644
--- a/x/wasm/internal/keeper/keeper.go
+++ b/x/wasm/internal/keeper/keeper.go
@@ -87,11 +87,6 @@ func (k Keeper) Create(ctx sdk.Context, creator sdk.AccAddress, wasmCode []byte,
 	return codeID, nil
 }
 
-// returns true when simulation mode used by gas=auto queries
-func isSimulationMode(ctx sdk.Context) bool {
-	return ctx.GasMeter().Limit() == 0 && ctx.BlockHeight() != 0
-}
-
 // Instantiate creates an instance of a WASM contract
 func (k Keeper) Instantiate(ctx sdk.Context, codeID uint64, creator, admin sdk.AccAddress, initMsg []byte, label string, deposit sdk.Coins) (sdk.AccAddress, error) {
 	// create contract address
@@ -371,7 +366,10 @@ func (k Keeper) setContractState(ctx sdk.Context, contractAddress sdk.AccAddress
 	prefixStoreKey := types.GetContractStorePrefixKey(contractAddress)
 	prefixStore := prefix.NewStore(ctx.KVStore(k.storeKey), prefixStoreKey)
 	for _, model := range models {
-		prefixStore.Set([]byte(model.Key), []byte(model.Value))
+		if model.Value == nil {
+			model.Value = []byte{}
+		}
+		prefixStore.Set(model.Key, model.Value)
 	}
 }