diff --git a/tasks/aws.yml b/tasks/aws.yml
index 2d479a9..238b060 100644
--- a/tasks/aws.yml
+++ b/tasks/aws.yml
@@ -27,6 +27,8 @@
   args:
     chdir: "{{ xrt_tmp.path }}"
   changed_when: false
+  failed_when: _aws_sig.rc != 0 and "could not be verified." not in _aws_sig.stderr
+  register: _aws_sig
   when:
     - xilinx_xrt_install | bool
     - not xbutil.stat.exists
diff --git a/tasks/main.yml b/tasks/main.yml
index 094b2f0..d674e2d 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -86,6 +86,8 @@
   args:
     chdir: "{{ xrt_tmp.path }}"
   changed_when: false
+  failed_when: _xrt_sig.rc != 0 and "could not be verified." not in _xrt_sig.stderr
+  register: _xrt_sig
   when:
     - xilinx_xrt_install | bool
     - not xbutil.stat.exists