Fixed null pointer errors on clock