Checks if time is null and sets to 0
Merge remote-tracking branch 'origin/master'