EZP-20505: Replaced exception with log
EZP-20502: moved logic up to the field types