diff --git a/roles/patrix/tasks/main.yml b/roles/patrix/tasks/main.yml
index 2ba8e1b..5a37ad5 100644
--- a/roles/patrix/tasks/main.yml
+++ b/roles/patrix/tasks/main.yml
@@ -1,6 +1,6 @@
 ---
 
-- include_tasks: install_{{ ansible_os_family }}.yml
+- include: install_{{ ansible_os_family }}.yml
 
 - name: Deploy patrix config for root user
   template: src=patrixrc.j2 dest=/root/.patrixrc mode='600'
diff --git a/roles/zimbra/tasks/main.yml b/roles/zimbra/tasks/main.yml
index 7b51f22..fc108d3 100644
--- a/roles/zimbra/tasks/main.yml
+++ b/roles/zimbra/tasks/main.yml
@@ -32,7 +32,7 @@
 
 - name: Exit if not installed
   meta: end_host
-  when: zcs_install != True and not zcs_zmprov.stat.exists
+  when: zcs_install != True and (zcs_zmprov is not defined or zcs_zmprov.stat is not defined or not zcs_zmprov.stat.exists)
   tags: zcs
 
 - set_fact: zcs_i_am_primary_ldap={{ (inventory_hostname == zcs_primary_ldap) | ternary(True,False) }}