Don't break when data contains null values

refs #4