diff --git a/deployment/ccip/add_lane_test.go b/deployment/ccip/add_lane_test.go
index 5edfdae1ab0..15036476647 100644
--- a/deployment/ccip/add_lane_test.go
+++ b/deployment/ccip/add_lane_test.go
@@ -43,7 +43,6 @@ func TestAddLane(t *testing.T) {
 		HomeChainSel:   e.HomeChainSel,
 		FeedChainSel:   e.FeedChainSel,
 		TokenConfig:    tokenConfig,
-		MCMSConfig:     NewTestMCMSConfig(t, e.Env),
 		ChainsToDeploy: []uint64{chain1, chain2},
 		OCRSecrets:     deployment.XXXGenerateTestOCRSecrets(),
 	})
diff --git a/deployment/ccip/deploy.go b/deployment/ccip/deploy.go
index 27f2771e7f4..7897c8dbb68 100644
--- a/deployment/ccip/deploy.go
+++ b/deployment/ccip/deploy.go
@@ -277,7 +277,10 @@ type DeployCCIPContractConfig struct {
 // It then deploys the rest of the CCIP chain contracts to the selected chains
 // registers the nodes with the capability registry and creates a DON for
 // each new chain. TODO: Might be better to break this down a bit?
-func DeployCCIPContracts(e deployment.Environment, ab deployment.AddressBook, c DeployCCIPContractConfig) error {
+func DeployCCIPContracts(
+	e deployment.Environment,
+	ab deployment.AddressBook,
+	c DeployCCIPContractConfig) error {
 	if c.OCRSecrets.IsEmpty() {
 		return fmt.Errorf("OCR secrets are empty")
 	}
@@ -401,6 +404,9 @@ func DeployChainContracts(
 	if chainState.Weth9 == nil {
 		return fmt.Errorf("weth9 not found for chain %d, deploy the prerequisites first", chain.Selector)
 	}
+	if chainState.Timelock == nil {
+		return fmt.Errorf("timelock not found for chain %d, deploy the mcms contracts first", chain.Selector)
+	}
 	weth9Contract := chainState.Weth9
 	if chainState.LinkToken == nil {
 		return fmt.Errorf("link token not found for chain %d, deploy the prerequisites first", chain.Selector)