diff --git a/roles/0-init/tasks/main.yml b/roles/0-init/tasks/main.yml
index 46d7c4de3..ae246e1de 100644
--- a/roles/0-init/tasks/main.yml
+++ b/roles/0-init/tasks/main.yml
@@ -73,7 +73,7 @@
 - name: Set internet_available true if wget succeeded
   set_fact:
     internet_available: True
-  when: not internet_access_test|failed and not disregard_network
+  when: not internet_access_test.failed and not disregard_network
 
 - name: Remove Internet test file
   file:
@@ -114,7 +114,7 @@
   set_fact:
     postgresql_install: True
     postgresql_enabled: True
-  when: moodle_enabled or pathagar_enabled
+  when: moodle_enabled or (pathagar is defined and pathagar_enabled)
 
 #- name: Turn on vars for Docker if SchoolTool is to be installed
 #  set_fact: