diff --git a/roles/bgp_checks/tasks/check.yaml b/roles/bgp_checks/tasks/check.yaml
index 990f5480e6e5e88a6cfa141a2dc70854b3ed05be..ff4f3aadccf1fccc2aa7da75643ebc8f13f5eaa5 100644
--- a/roles/bgp_checks/tasks/check.yaml
+++ b/roles/bgp_checks/tasks/check.yaml
@@ -54,6 +54,14 @@
     that:
       -  post_check.{{ check_id }}.nlri_peerconf is defined
       -  pre_check.{{ check_id }}.nlri_peerconf is defined
+      -  post_check.{{ check_id }}.nlri_peer is defined
+      -  pre_check.{{ check_id }}.nlri_peer is defined
+      -  post_check.{{ check_id }}.nlri_peerconf is defined
+      -  pre_check.{{ check_id }}.nlri_peerconf is defined
+      -  post_check.{{ check_id }}.nlri_session is defined
+      -  pre_check.{{ check_id }}.nlri_session is defined
+      -  post_check.{{ check_id }}.nlri_rib is defined
+      -  pre_check.{{ check_id }}.nlri_rib is defined
       - "post_check.{{ check_id }}.nlri_peerconf == pre_check.{{ check_id }}.nlri_peerconf"
       - "post_check.{{ check_id }}.nlri_peer == pre_check.{{ check_id }}.nlri_peer"
       - "post_check.{{ check_id }}.nlri_session == pre_check.{{ check_id }}.nlri_session"
@@ -68,6 +76,8 @@
 - name: Compare the number of advertised routes
   ansible.builtin.assert:
     that:
+      - post_check.bgp_adv_routes is defined
+      - pre_check.bgp_adv_routes is defined
       - "((pre_check.{{ check_id }}.bgp_adv_routes - post_check.{{ check_id }}.bgp_adv_routes) / pre_check.{{ check_id }}.bgp_adv_routes) * 100 | abs <= 5"
     fail_msg: "FAIL: the number of advertised routes isn't within 5% of difference"
     success_msg: "PASS: the number of advertised routes is within 5% of difference"
@@ -76,6 +86,8 @@
 - name: Compare the number of received routes
   ansible.builtin.assert:
     that:
+      - post_check.bgp_adv_routes is defined
+      - pre_check.bgp_adv_routes is defined
       - "((pre_check.{{ check_id }}.bgp_rec_routes - post_check.{{ check_id }}.bgp_rec_routes) / pre_check.{{ check_id }}.bgp_rec_routes) * 100 | abs <= 5"
     fail_msg: "FAIL: the number of received routes isn't within 5% of difference"
     success_msg: "PASS: the number of received routes is within 5% of difference"