- Fix null task issue with timings