diff --git a/cmd/era/main.go b/cmd/era/main.go
index 48687617ca..c8cb43d827 100644
--- a/cmd/era/main.go
+++ b/cmd/era/main.go
@@ -121,10 +121,7 @@ func block(ctx *cli.Context) error {
 		return fmt.Errorf("error reading block %d: %w", num, err)
 	}
 	// Convert block to JSON and print.
-	val, err := ethapi.RPCMarshalBlock(block, ctx.Bool(txsFlag.Name), ctx.Bool(txsFlag.Name), params.MainnetChainConfig)
-	if err != nil {
-		return fmt.Errorf("error marshaling json: %w", err)
-	}
+	val := ethapi.RPCMarshalBlock(block, ctx.Bool(txsFlag.Name), ctx.Bool(txsFlag.Name), params.MainnetChainConfig)
 	b, err := json.MarshalIndent(val, "", "  ")
 	if err != nil {
 		return fmt.Errorf("error marshaling json: %w", err)
diff --git a/cmd/utils/history_test.go b/cmd/utils/history_test.go
index 69256aaf01..d4500be53d 100644
--- a/cmd/utils/history_test.go
+++ b/cmd/utils/history_test.go
@@ -170,7 +170,7 @@ func TestHistoryImportAndExport(t *testing.T) {
 		db2.Close()
 	})
 
-	genesis.MustCommit(db2)
+	genesis.MustCommit(db2, trie.NewDatabase(db, trie.HashDefaults))
 	imported, err := core.NewBlockChain(db2, nil, genesis, nil, ethash.NewFaker(), vm.Config{}, nil, nil)
 	if err != nil {
 		t.Fatalf("unable to initialize chain: %v", err)