Deal with empties converted to None.