diff --git a/op-deployer/pkg/deployer/pipeline/opchain.go b/op-deployer/pkg/deployer/pipeline/opchain.go
index 4279876154e4..83f07039d730 100644
--- a/op-deployer/pkg/deployer/pipeline/opchain.go
+++ b/op-deployer/pkg/deployer/pipeline/opchain.go
@@ -94,8 +94,10 @@ func DeployOPChain(ctx context.Context, env *Env, bundle ArtifactsBundle, intent
 		DelayedWETHPermissionlessGameProxyAddress: dco.DelayedWETHPermissionlessGameProxy,
 	})
 
-	currentBlock, _ := env.L1Client.BlockNumber(ctx)
-	block, _ := env.L1Client.BlockByNumber(ctx, big.NewInt(int64(currentBlock)))
+	block, err := env.L1Client.BlockByNumber(ctx, nil)
+	if err != nil {
+		return fmt.Errorf("failed to get latest block by number: %w", err)
+	}
 	currentBlockHash := block.Hash()
 
 	errCh := make(chan error, 8)
@@ -137,7 +139,7 @@ func DeployOPChain(ctx context.Context, env *Env, bundle ArtifactsBundle, intent
 	var lastTaskErr error
 	for i := 0; i < len(setImplementationAddressTasks); i++ {
 		taskErr := <-errCh
-		if lastTaskErr != nil {
+		if taskErr != nil {
 			lastTaskErr = taskErr
 		}
 	}