diff --git a/x/wasm/keeper/genesis_test.go b/x/wasm/keeper/genesis_test.go
index aaab0e952e..7334b4bc68 100644
--- a/x/wasm/keeper/genesis_test.go
+++ b/x/wasm/keeper/genesis_test.go
@@ -83,7 +83,8 @@ func TestGenesisExportImport(t *testing.T) {
 		contractAddr := wasmKeeper.ClassicAddressGenerator()(srcCtx, codeID, nil)
 		wasmKeeper.storeContractInfo(srcCtx, contractAddr, &contract)
 		wasmKeeper.appendToContractHistory(srcCtx, contractAddr, history...)
-		wasmKeeper.importContractState(srcCtx, contractAddr, stateModels)
+		err = wasmKeeper.importContractState(srcCtx, contractAddr, stateModels)
+		require.NoError(t, err)
 	}
 	var wasmParams types.Params
 	f.NilChance(0).Fuzz(&wasmParams)
diff --git a/x/wasm/keeper/test_fuzz.go b/x/wasm/keeper/test_fuzz.go
index c70cec6aca..2b15a26be7 100644
--- a/x/wasm/keeper/test_fuzz.go
+++ b/x/wasm/keeper/test_fuzz.go
@@ -51,10 +51,12 @@ func FuzzContractCodeHistory(m *types.ContractCodeHistoryEntry, c fuzz.Continue)
 
 func FuzzStateModel(m *types.Model, c fuzz.Continue) {
 	m.Key = tmBytes.HexBytes(c.RandString())
-	if len(m.Key) == 0 {
-		m.Key = tmBytes.HexBytes("non empty key")
+	if len(m.Key) != 0 {
+		c.Fuzz(&m.Value)
+		return
 	}
-	c.Fuzz(&m.Value)
+	// try again, keys must not be empty
+	FuzzStateModel(m, c)
 }
 
 func FuzzAccessType(m *types.AccessType, c fuzz.Continue) {