diff --git a/deployment/common/proposalutils/mcms_helpers.go b/deployment/common/proposalutils/mcms_helpers.go
index 4a7540761ee..51a720a4389 100644
--- a/deployment/common/proposalutils/mcms_helpers.go
+++ b/deployment/common/proposalutils/mcms_helpers.go
@@ -149,7 +149,9 @@ func RunTimelockExecutor(env deployment.Environment, cfg RunTimelockExecutorConf
 						Value:  it.Event.Value,
 					})
 				}
-
+				if len(calls) == 0 {
+					return fmt.Errorf("no calls found for chain %d in blocks [%d, %d]", cfg.ChainSelector, *start, *end)
+				}
 				timelockExecutorProxy, err := owner_helpers.NewRBACTimelock(cfg.TimelockContracts.CallProxy.Address(), env.Chains[cfg.ChainSelector].Client)
 				if err != nil {
 					return fmt.Errorf("error creating timelock executor proxy: %w", err)
diff --git a/deployment/keystone/deploy.go b/deployment/keystone/deploy.go
index 7d3e5391219..cb7804d0051 100644
--- a/deployment/keystone/deploy.go
+++ b/deployment/keystone/deploy.go
@@ -483,6 +483,10 @@ func RegisterCapabilities(lggr logger.Logger, req RegisterCapabilitiesRequest) (
 	for cap := range uniqueCaps {
 		capabilities = append(capabilities, cap)
 	}
+	if len(capabilities) == 0 {
+		lggr.Warn("no new capabilities to register")
+		return &RegisterCapabilitiesResponse{}, nil
+	}
 	// not using mcms; ignore proposals
 	_, err = AddCapabilities(lggr, &contracts, registryChain, capabilities, false)
 	if err != nil {