Fix "null" showing up for null values