Handle CSV nulls

 #249 should go in first