diff --git a/ipmi/test_ipmi_fru.robot b/ipmi/test_ipmi_fru.robot
index 0629c19..9552013 100644
--- a/ipmi/test_ipmi_fru.robot
+++ b/ipmi/test_ipmi_fru.robot
@@ -13,7 +13,6 @@
 
 *** Variables ***
 &{ipmi_redfish_fru_field_map}  board_serial=SerialNumber  board_part_number=PartNumber
-...  board_product=Name
 
 *** Test Cases ***
 
@@ -78,6 +77,7 @@
     ${key_map}=  Get Dictionary Items   ${ipmi_redfish_fru_field_map}
 
     FOR    ${key}    ${value}    IN    @{key_map}
+      Exit For Loop IF    "${value}" == "${EMPTY}"
       Should Contain  ${redfish_fru_component_obj['${value}']}
       ...  ${ipmi_fru_component_obj['${key}']}
       ...  msg=Comparison failed.
@@ -101,4 +101,4 @@
 Test Teardown Execution
     [Documentation]  Do the post test teardown.
 
-    FFDC On Test Case Fail
+    FFDC On Test Case Fail
\ No newline at end of file