CONN-645:Fix throwing Exception for each field when format is entity