Nulls in the data were causing errors, fixed