Better handling of exception on field name duplication