OS-2144 add zonepath to fw_fields list and prevent looping test on error.