CR-IC-320 follow-up to 8ac3b41, do not skip when value= null