diff --git a/roles/build-container-image/tasks/main.yaml b/roles/build-container-image/tasks/main.yaml
index 42dfd716a..fdc685dac 100644
--- a/roles/build-container-image/tasks/main.yaml
+++ b/roles/build-container-image/tasks/main.yaml
@@ -1,9 +1,18 @@
+- name: Check for results.json
+  stat:
+    path: "{{ zuul.executor.work_root }}/results.json"
+  register: result_json_stat
+  delegate_to: localhost
+
 # This can be removed if we add this functionality to Zuul directly
 - name: Load information from zuul_return
-  when: buildset_registry is not defined
   set_fact:
     buildset_registry: "{{ (lookup('file', zuul.executor.work_root + '/results.json') | from_json)['buildset_registry'] }}"
-  ignore_errors: true
+  when:
+    - buildset_registry is not defined
+    - result_json_stat.stat.exists
+    - result_json_stat.stat.size > 0
+    - "'buildset_registry' in (lookup('file', zuul.executor.work_root + '/results.json') | from_json)"
 
 - name: Set container filename arg
   set_fact:
diff --git a/roles/build-docker-image/tasks/main.yaml b/roles/build-docker-image/tasks/main.yaml
index 5ab2fb9aa..c9b08fa40 100644
--- a/roles/build-docker-image/tasks/main.yaml
+++ b/roles/build-docker-image/tasks/main.yaml
@@ -1,9 +1,18 @@
+- name: Check for results.json
+  stat:
+    path: "{{ zuul.executor.work_root }}/results.json"
+  register: result_json_stat
+  delegate_to: localhost
+
 # This can be removed if we add this functionality to Zuul directly
 - name: Load information from zuul_return
-  when: buildset_registry is not defined
   set_fact:
     buildset_registry: "{{ (lookup('file', zuul.executor.work_root + '/results.json') | from_json)['buildset_registry'] }}"
-  ignore_errors: true
+  when:
+    - buildset_registry is not defined
+    - result_json_stat.stat.exists
+    - result_json_stat.stat.size > 0
+    - "'buildset_registry' in (lookup('file', zuul.executor.work_root + '/results.json') | from_json)"
 
 - name: Set up siblings
   include_tasks: siblings.yaml
diff --git a/roles/collect-container-logs/tasks/main.yaml b/roles/collect-container-logs/tasks/main.yaml
index 08e79c8d4..d5a3e8fb7 100644
--- a/roles/collect-container-logs/tasks/main.yaml
+++ b/roles/collect-container-logs/tasks/main.yaml
@@ -1,7 +1,7 @@
 - name: List containers
   command: "{{ container_command }} ps -a --format '{{ '{{ .Names }}' }}'"
   register: docker_containers
-  ignore_errors: true
+  failed_when: false
 
 - name: Create container log dir
   file: