diff --git a/tasks/nova_db_setup.yml b/tasks/nova_db_setup.yml
index e757c09e..0130d790 100644
--- a/tasks/nova_db_setup.yml
+++ b/tasks/nova_db_setup.yml
@@ -141,9 +141,11 @@
   become_user: "{{ nova_system_user_name }}"
   register: cell1_uuid
   changed_when: false
+  when: "nova_cell1_create.rc == 0"
 
 - name: Map instances to new Cell1
   command: "{{ nova_bin }}/nova-manage cell_v2 map_instances --cell_uuid {{ cell1_uuid['stdout'].split()[3] }}"
   become: yes
   become_user: "{{ nova_system_user_name }}"
   changed_when: false
+  when: "nova_cell1_create.rc == 0"