diff --git a/tasks/common/controller_post_scripts.yml b/tasks/common/controller_post_scripts.yml
index 25c6cf6c..7e2f1216 100644
--- a/tasks/common/controller_post_scripts.yml
+++ b/tasks/common/controller_post_scripts.yml
@@ -2,4 +2,4 @@
 - include_tasks: controller_post_script.yml
   loop_control:
     loop_var: node_name
-  loop: "{{ inventory_hostmap[controller_role_name] }}"
+  loop: "{{ inventory_hostmap[controller_role_name] | default([]) }}"
diff --git a/tasks/fast-forward-upgrade/overcloud_upgrade_fast_and_furious.yaml b/tasks/fast-forward-upgrade/overcloud_upgrade_fast_and_furious.yaml
index 0bb1ca97..c869589f 100644
--- a/tasks/fast-forward-upgrade/overcloud_upgrade_fast_and_furious.yaml
+++ b/tasks/fast-forward-upgrade/overcloud_upgrade_fast_and_furious.yaml
@@ -1,13 +1,16 @@
 ---
 - set_fact:
     pcs_host: ""
+- set_fact:
+    boostrap_node: "{{ ((oc_roles_hosts|dict2items |
+                      selectattr('key', 'in', inventory_rolemap['mysql'] | default([]))) |
+                       map(attribute='value') | map('sort') |  list | flatten(1))[0] | default('') }}"
 - name: Create /var/lib/tripleo/transfer-flags/var-lib-mysql in bootstrap node
   become: true
   become_user: "{{ (overcloud_ssh_user) | ternary(overcloud_ssh_user, 'heat-admin') }}"
-  delegate_to: "{{ ((oc_roles_hosts|dict2items |
-                     selectattr('key', 'in', inventory_rolemap['mysql'] | default([]))) |
-                     map(attribute='value') | map('sort') |  list | flatten(1))[0]   }}"
+  delegate_to: "{{ boostrap_node }}"
   shell: "sudo mkdir -p /var/lib/tripleo/transfer-flags && sudo touch /var/lib/tripleo/transfer-flags/var-lib-mysql"
+  when: boostrap_node|bool
 
 - name: upgrade the whole overcloud
   vars: