diff --git a/roles/docker/tasks/main.yml b/roles/docker/tasks/main.yml
index 407cadc..338d746 100644
--- a/roles/docker/tasks/main.yml
+++ b/roles/docker/tasks/main.yml
@@ -3,7 +3,7 @@
   - name: Check for mandatory variables required by this playbook
     fail:
       msg: "This playbook requires {{item}} to be set."
-    when: "{{ item }} is not defined or {{ item }} == ''"
+    when: "item is not defined or item == ''"
     with_items:
     - docker_storage_vg
     tags: docker-storage
diff --git a/roles/name-resolution/tasks/main.yml b/roles/name-resolution/tasks/main.yml
index f161c37..7a64ecd 100644
--- a/roles/name-resolution/tasks/main.yml
+++ b/roles/name-resolution/tasks/main.yml
@@ -3,10 +3,10 @@
   - name: Check for mandatory variables required by this playbook
     fail:
       msg: "This playbook requires {{item}} to be set."
-    when: "{{ item }} is not defined or {{ item }} == ''"
+    when: "item is not defined or item == ''"
     with_items:
     - lab_dns_suffix
-    - lab_route_suffix
+    - openshift_master_default_subdomain
 
   - name: Make sure each machine has an up-to-date /etc/hosts
     template: dest=/etc/hosts src=hosts