diff --git a/tasks/create_lv.yml b/tasks/create_lv.yml
index af33523..63eb3fb 100644
--- a/tasks/create_lv.yml
+++ b/tasks/create_lv.yml
@@ -5,7 +5,7 @@
     verbosity: 2
 
 - name: "debug lvm"
-  loop: "{{ vg.lvnames }}"
+  loop: "{{ vg.lvnames | default([]) }}"
   debug:
     var: lv
     verbosity: 1
@@ -20,7 +20,7 @@
     shrink: no
     opts: "{{ lv.opts | default('') }}"
     state: "present"
-  loop: "{{ vg.lvnames }}"
+  loop: "{{ vg.lvnames | default([])  }}"
   loop_control:
     loop_var: lv
   become: true
@@ -28,8 +28,7 @@
     (
     (vg.create is defined
     and vg.create) and
-    (lv is defined and
-    lv != 'None') and
+    (lv != 'None') and
     (lv.create is defined and
     lv.create)
     )
diff --git a/tasks/main.yml b/tasks/main.yml
index 83cf1aa..34c5d10 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -6,7 +6,7 @@
 - include_tasks: centos.yml
   when: ansible_os_family == "RedHat"
 
-- include_tasks: managelvm.yml
+- include_tasks: manage_lvm.yml
   when: >
     manage_lvm and
     lvm_groups is defined
diff --git a/tasks/managelvm.yml b/tasks/manage_lvm.yml
similarity index 100%
rename from tasks/managelvm.yml
rename to tasks/manage_lvm.yml