diff --git a/tasks/configure.yml b/tasks/configure.yml
index a8a424a..c455f14 100644
--- a/tasks/configure.yml
+++ b/tasks/configure.yml
@@ -45,6 +45,7 @@
   set_fact:
     puppet_agent_cmd: "{{ puppet_which.stdout }}"
   when:
+    - puppet_which_stat
     - puppet_which_stat.stat.exists
     - not puppet_which_stat.stat.isdir
     - puppet_which_stat.stat.executable
@@ -70,10 +71,11 @@
   when:
     - not puppet_agent_cmd
 
-- name: Set puppet agent command (from which)
+- name: Set puppet agent command (from whereis)
   set_fact:
     puppet_agent_cmd: "{{ puppet_whereis.stdout }}"
   when:
+    - puppet_whereis_stat
     - puppet_whereis_stat.stat.exists
     - not puppet_whereis_stat.stat.isdir
     - puppet_whereis_stat.stat.executable