Null and '--' now return as 'NA'