DS-2355

Fixes DS-2355 -- null value throws an uncaught error resulting in loss of statistic.