Added a check for null when assembling a cached value - REPORT-237