diff --git a/handlers/handlers.yml b/handlers/main.yml
similarity index 100%
rename from handlers/handlers.yml
rename to handlers/main.yml
diff --git a/tasks/system.yml b/tasks/system.yml
index 89b1193..9a52877 100644
--- a/tasks/system.yml
+++ b/tasks/system.yml
@@ -29,16 +29,19 @@
     virt_pool:
       command: destroy
       name: default
+    when: ansible_libvirt_pools.default.path is defined 
 
   - name: Set default pool to inactive
     virt_pool:
       state: inactive
       name: default
+    when: ansible_libvirt_pools.default.path is defined 
 
   - name: Undefine default pool
     virt_pool:
       command: undefine
       name: default
+    when: ansible_libvirt_pools.default.path is defined 
 
   - name: Define default pool from template
     virt_pool:
@@ -61,7 +64,7 @@
       autostart: yes
       name: default
 
-  when: ansible_libvirt_pools.default.path != libvirt_storage_path
+  when: "ansible_libvirt_pools.default.path != libvirt_storage_path or ansible_libvirt_pools.default.path is not defined"
 
 - block:
 
diff --git a/tasks/users.yml b/tasks/users.yml
index b97396a..ba15f5d 100644
--- a/tasks/users.yml
+++ b/tasks/users.yml
@@ -31,6 +31,8 @@
     path: /home/{{ local_user }}/.cert
     state: directory
     mode: 0750
+    owner: "{{ local_user }}"
+    group: "{{ local_user }}"
 
 - name: Run restorecon on /home/{{ local_user }}/.cert
   command: /usr/sbin/restorecon -R -v /home/{{ local_user }}/.cert