diff --git a/firehose/globals.go b/firehose/globals.go
index a02a24bcac10..d5aaae4eb150 100644
--- a/firehose/globals.go
+++ b/firehose/globals.go
@@ -83,7 +83,7 @@ func Init(
 	// We must check for both `nil` and `(*core.Genesis)(nil)`, latter case that is not catch by using `genesis == nil` directly
 	if !isNilInterfaceOrNilValue(genesis) {
 		GenesisConfig = genesis
-		genesisProvenance = "Geth Specific Flag"
+		genesisProvenance = "Geth Specific Flag (--<chain>)"
 	} else {
 		if genesisFilePath := genesisFile; genesisFilePath != "" {
 			file, err := os.Open(genesisFilePath)
@@ -98,7 +98,7 @@ func Init(
 			}
 
 			GenesisConfig = genesis
-			genesisProvenance = "User provider"
+			genesisProvenance = "Firehose Specific Flag (--firehose-genesis <file>)"
 		}
 	}
 
diff --git a/internal/debug/flags.go b/internal/debug/flags.go
index 7a3acb1947af..b2974a2a3707 100644
--- a/internal/debug/flags.go
+++ b/internal/debug/flags.go
@@ -191,7 +191,7 @@ func Setup(ctx *cli.Context, firehoseGenesis *core.Genesis, firehoseGethVersion
 		StartPProf(address, !ctx.GlobalIsSet("metrics.addr"))
 	}
 
-	firehose.Init(ctx.GlobalBool(firehoseEnabledFlag.Name),
+	if err := firehose.Init(ctx.GlobalBool(firehoseEnabledFlag.Name),
 		ctx.GlobalBoolT(firehoseSyncInstrumentationFlag.Name),
 		ctx.GlobalBool(firehoseMiningEnabledFlag.Name),
 		ctx.GlobalBool(firehoseBlockProgressFlag.Name),
@@ -199,7 +199,9 @@ func Setup(ctx *cli.Context, firehoseGenesis *core.Genesis, firehoseGethVersion
 		ctx.GlobalString(firehoseGenesisFileFlag.Name),
 		func() interface{} { return new(core.Genesis) },
 		firehoseGethVersion,
-	)
+	); err != nil {
+		return fmt.Errorf("initializing firehose: %w", err)
+	}
 
 	return nil
 }