diff --git a/roles/common/tasks/main.yml b/roles/common/tasks/main.yml
index 7a4307b..f9199b7 100755
--- a/roles/common/tasks/main.yml
+++ b/roles/common/tasks/main.yml
@@ -15,19 +15,26 @@
       ansible.builtin.apt:
         update_cache: true
         upgrade: full
-      when: ansible_facts.os_family == "Debian" or inventory_hostname in ['rpi5.home.lan']
+      when: >
+          inventory_hostname == 'rpi5.home.lan' or
+          (ansible_facts.os_family is defined and
+          ansible_facts.os_family == 'Debian')
     
     - name: Upgrade RHEL / Rocky / Alma / CentOS
       ansible.builtin.dnf:
         name: "*"
         state: latest
-      when: ansible_facts.os_family == "RedHat"
+      when: > 
+        (ansible_facts.os_family is defined and
+        ansible_facts.os_family == "RedHat")
 
     - name: Upgrade SUSE
       ansible.builtin.zypper:
         name: "*"
         state: latest
-      when: ansible_facts.os_family == "Suse"
+      when: >
+        (ansible_facts.os_family is defined and
+        ansible_facts.os_family == "Suse")
 
     - name: Upgrade flatpack
       ansible.builtin.command: flatpak update -y