diff --git a/linux/storage/lvm.sls b/linux/storage/lvm.sls
index f0ff3e5..4ac0232 100644
--- a/linux/storage/lvm.sls
+++ b/linux/storage/lvm.sls
@@ -52,7 +52,8 @@ lvm_{{ vg.get('name', vgname) }}_lv_{{ volume.get('name', lvname) }}:
     - vgname: {{ vg.get('name', vgname) }}
     - size: {{ volume.size }}
     {%- if (volume.force is defined and volume.force is sameas true) or
-           (volume.get('name', lvname) not in grains.lvm[vg.get('name', vgname)]) %}
+           (grains.lvm is defined and vg.get('name', vgname) in grains.lvm and
+            volume.get('name', lvname) not in grains.lvm[vg.get('name', vgname)]) %}
     - force: True
     {%- else %}
     - force: False
@@ -60,7 +61,8 @@ lvm_{{ vg.get('name', vgname) }}_lv_{{ volume.get('name', lvname) }}:
     - require:
       - lvm: lvm_vg_{{ vg.get('name', vgname) }}
     {%- if (volume.mount is defined) and
-           (volume.get('name', lvname) not in grains.lvm[vg.get('name', vgname)]) %}
+           (grains.lvm is defined and vg.get('name', vgname) in grains.lvm and
+            volume.get('name', lvname) not in grains.lvm[vg.get('name', vgname)]) %}
     - require_in:
       - mount: {{ volume.mount.path }}
     {%- if not volume.mount.get('file_system', None) in ['nfs', 'nfs4', 'cifs', 'tmpfs', None] %}