diff --git a/modules/asm/scripts/create_cpr.sh b/modules/asm/scripts/create_cpr.sh
index d592e5453..9ceb33231 100755
--- a/modules/asm/scripts/create_cpr.sh
+++ b/modules/asm/scripts/create_cpr.sh
@@ -57,4 +57,4 @@ spec:
   channel: "${CHANNEL}"
 EOF
 
-kubectl wait -n istio-system --for=condition=Reconciled controlplanerevision/"${REVISION_NAME}" --timeout 10m
+kubectl wait -n istio-system --for=condition=Reconciled controlplanerevision/"${REVISION_NAME}" --timeout 20m
diff --git a/modules/fleet-membership/main.tf b/modules/fleet-membership/main.tf
index 92d5d83f7..e57418caf 100644
--- a/modules/fleet-membership/main.tf
+++ b/modules/fleet-membership/main.tf
@@ -18,7 +18,7 @@ locals {
   hub_project_id                   = var.hub_project_id == "" ? var.project_id : var.hub_project_id
   gke_hub_membership_name_complete = var.membership_name != "" ? var.membership_name : "${var.project_id}-${var.location}-${var.cluster_name}"
   gke_hub_membership_name          = trimsuffix(substr(local.gke_hub_membership_name_complete, 0, 63), "-")
-  gke_hub_membership_location      = regex(local.gke_hub_membership_location_re, data.google_container_cluster.primary.fleet[0].membership)[0]
+  gke_hub_membership_location      = try(regex(local.gke_hub_membership_location_re, data.google_container_cluster.primary.fleet[0].membership)[0], null)
   gke_hub_membership_location_re   = "//gkehub.googleapis.com/projects/[^/]*/locations/([^/]*)/memberships/[^/]*$"
 }