diff --git a/fast/stages/00-bootstrap/outputs.tf b/fast/stages/00-bootstrap/outputs.tf
index 46677b6a..5779d5b2 100644
--- a/fast/stages/00-bootstrap/outputs.tf
+++ b/fast/stages/00-bootstrap/outputs.tf
@@ -17,7 +17,7 @@
 locals {
   custom_roles = {
     for k, v in var.custom_role_names :
-    k => module.organization.custom_role_id[v]
+    k => try(module.organization.custom_role_id[v], null)
   }
   providers = {
     "00-bootstrap" = templatefile("${path.module}/../../assets/templates/providers.tpl", {
diff --git a/fast/stages/01-resman/branch-data-platform.tf b/fast/stages/01-resman/branch-data-platform.tf
index e6ecad3f..d5eeafa0 100644
--- a/fast/stages/01-resman/branch-data-platform.tf
+++ b/fast/stages/01-resman/branch-data-platform.tf
@@ -23,7 +23,7 @@ module "branch-dp-folder" {
   parent = "organizations/${var.organization.id}"
   name   = "Data Platform"
   tag_bindings = {
-    context = module.organization.tag_values["context/data"].id
+    context = try(module.organization.tag_values["context/data"].id, null)
   }
 }
 
@@ -43,7 +43,7 @@ module "branch-dp-dev-folder" {
     "roles/resourcemanager.projectCreator" = [module.branch-dp-dev-sa.iam_email]
   }
   tag_bindings = {
-    context = module.organization.tag_values["environment/development"].id
+    context = try(module.organization.tag_values["environment/development"].id, null)
   }
 }
 
@@ -82,7 +82,7 @@ module "branch-dp-prod-folder" {
     "roles/resourcemanager.projectCreator" = [module.branch-dp-prod-sa.iam_email]
   }
   tag_bindings = {
-    context = module.organization.tag_values["environment/production"].id
+    context = try(module.organization.tag_values["environment/production"].id, null)
   }
 }
 
diff --git a/fast/stages/01-resman/branch-networking.tf b/fast/stages/01-resman/branch-networking.tf
index 43ababfc..105c302f 100644
--- a/fast/stages/01-resman/branch-networking.tf
+++ b/fast/stages/01-resman/branch-networking.tf
@@ -39,7 +39,7 @@ module "branch-network-folder" {
     "roles/compute.xpnAdmin"               = [module.branch-network-sa.iam_email]
   }
   tag_bindings = {
-    context = module.organization.tag_values["context/networking"].id
+    context = try(module.organization.tag_values["context/networking"].id, null)
   }
 }
 
@@ -73,7 +73,7 @@ module "branch-network-prod-folder" {
     ]
   }
   tag_bindings = {
-    environment = module.organization.tag_values["environment/production"].id
+    environment = try(module.organization.tag_values["environment/production"].id, null)
   }
 }
 
@@ -88,6 +88,6 @@ module "branch-network-dev-folder" {
     ]
   }
   tag_bindings = {
-    environment = module.organization.tag_values["environment/development"].id
+    environment = try(module.organization.tag_values["environment/development"].id, null)
   }
 }
diff --git a/fast/stages/01-resman/branch-sandbox.tf b/fast/stages/01-resman/branch-sandbox.tf
index fa5441ef..70772cbc 100644
--- a/fast/stages/01-resman/branch-sandbox.tf
+++ b/fast/stages/01-resman/branch-sandbox.tf
@@ -38,7 +38,7 @@ module "branch-sandbox-folder" {
     }
   }
   tag_bindings = {
-    context = module.organization.tag_values["context/sandbox"].id
+    context = try(module.organization.tag_values["context/sandbox"].id, null)
   }
 }
 
diff --git a/fast/stages/01-resman/branch-security.tf b/fast/stages/01-resman/branch-security.tf
index 7f0344a6..69024762 100644
--- a/fast/stages/01-resman/branch-security.tf
+++ b/fast/stages/01-resman/branch-security.tf
@@ -40,7 +40,7 @@ module "branch-security-folder" {
     "roles/resourcemanager.projectCreator" = [module.branch-security-sa.iam_email]
   }
   tag_bindings = {
-    context = module.organization.tag_values["context/security"].id
+    context = try(module.organization.tag_values["context/security"].id, null)
   }
 }
 
diff --git a/fast/stages/01-resman/branch-teams.tf b/fast/stages/01-resman/branch-teams.tf
index ec6b64f3..81ba946a 100644
--- a/fast/stages/01-resman/branch-teams.tf
+++ b/fast/stages/01-resman/branch-teams.tf
@@ -23,7 +23,7 @@ module "branch-teams-folder" {
   parent = "organizations/${var.organization.id}"
   name   = "Teams"
   tag_bindings = {
-    context = module.organization.tag_values["context/teams"].id
+    context = try(module.organization.tag_values["context/teams"].id, null)
   }
 }
 
@@ -92,7 +92,7 @@ module "branch-teams-team-dev-folder" {
     "roles/resourcemanager.projectCreator" = [module.branch-teams-dev-pf-sa.iam_email]
   }
   tag_bindings = {
-    environment = module.organization.tag_values["environment/development"].id
+    environment = try(module.organization.tag_values["environment/development"].id, null)
   }
 }
 
@@ -135,7 +135,7 @@ module "branch-teams-team-prod-folder" {
     "roles/resourcemanager.projectCreator" = [module.branch-teams-prod-pf-sa.iam_email]
   }
   tag_bindings = {
-    environment = module.organization.tag_values["environment/production"].id
+    environment = try(module.organization.tag_values["environment/production"].id, null)
   }
 }