DS-2355 uncaught NPE resulting in loss of statistic