diff --git a/tasks/download_files.yml b/tasks/download_files.yml
index ba835ff..f5b1361 100644
--- a/tasks/download_files.yml
+++ b/tasks/download_files.yml
@@ -4,12 +4,13 @@
     msg: "Please specify a local download folder: -e download_folder=<local download folder>"
   when: download_folder is not defined
 
-- name: Examine result passed in
+- name: Examine download_set passed in
   debug:
-    var: file_result.files
+    var: download_set
 
 - name: Download files
   fetch:
     src: "{{ item.path }}"
     dest: "{{ download_folder }}"
-  with_items: "{{ file_result.files }}"
+  with_items: "{{ download_set.files }}"
+  when: download_set.files | length > 0
diff --git a/tasks/main.yml b/tasks/main.yml
index 446545f..e4cd30f 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -26,5 +26,5 @@
 - name: Iterate over files found
   include: download_files.yml
   vars:
-    file_result: "{{ item }}"
-  with_items: "{{ downloads.results }}"
+    download_set: "{{ item }}"
+  with_items: "{{ downloads }}"