diff --git a/core/genesis.go b/core/genesis.go
index 830fb033b8..cab9c645db 100644
--- a/core/genesis.go
+++ b/core/genesis.go
@@ -183,7 +183,11 @@ func SetupGenesisBlockWithOverride(db ethdb.Database, genesis *Genesis, constant
 			return genesis.Config, hash, &GenesisMismatchError{stored, hash}
 		}
 		block, err := genesis.Commit(db)
-		return genesis.Config, block.Hash(), err
+		var hash common.Hash
+		if block != nil {
+			hash = block.Hash()
+		}
+		return genesis.Config, hash, err
 	}
 
 	// Check whether the genesis block is already written.