diff --git a/Playbook-Test/Playbook-Test2.yaml b/Playbook-Test/Playbook-Test2.yaml
index 8f5d7fc61e623bf9a4301b52c66206fb586056e5..fc753484bf5c8c59b3789998dd3796d79f67cfe6 100644
--- a/Playbook-Test/Playbook-Test2.yaml
+++ b/Playbook-Test/Playbook-Test2.yaml
@@ -30,9 +30,9 @@
     - name: Output for pending reboot
       debug:
         msg: "A system restart is required."
-      when: reboot_required_output.rc == 0 and "Yes" in reboot_required_output.stdout
+      when: reboot_required_output.stdout is defined and "Yes" in reboot_required_output.stdout
 
     - name: Output for no pending reboot
       debug:
         msg: "No system restart is required."
-      when: reboot_required_output.rc == 0 and "Yes" not in reboot_required_output.stdout
+      when: reboot_required_output.stdout is not defined or "Yes" not in reboot_required_output.stdout