Change reference to time-series
Guard against null data source throwing exception