Added check if field is non-empty.