added logic to handle field setting on null rows