diff --git a/awx/main/tasks/receptor.py b/awx/main/tasks/receptor.py
index 0dda5b48ad..a5e2586f4d 100644
--- a/awx/main/tasks/receptor.py
+++ b/awx/main/tasks/receptor.py
@@ -234,7 +234,7 @@ def worker_info(node_name, work_type='ansible-runner'):
         else:
             error_list.append(details)
 
-    except (ReceptorNodeNotFound, RuntimeError) as exc:
+    except Exception as exc:
         error_list.append(str(exc))
 
     # If we have a connection error, missing keys would be trivial consequence of that
diff --git a/awx/main/tasks/system.py b/awx/main/tasks/system.py
index 0c22051f5a..24dbd98b6e 100644
--- a/awx/main/tasks/system.py
+++ b/awx/main/tasks/system.py
@@ -413,10 +413,12 @@ def execution_node_health_check(node):
         return
 
     if instance.node_type != 'execution':
-        raise RuntimeError(f'Execution node health check ran against {instance.node_type} node {instance.hostname}')
+        logger.warning(f'Execution node health check ran against {instance.node_type} node {instance.hostname}')
+        return
 
     if instance.node_state not in (Instance.States.READY, Instance.States.UNAVAILABLE, Instance.States.INSTALLED):
-        raise RuntimeError(f"Execution node health check ran against node {instance.hostname} in state {instance.node_state}")
+        logger.warning(f"Execution node health check ran against node {instance.hostname} in state {instance.node_state}")
+        return
 
     data = worker_info(node)