[Bug 754329] Make clock handling more robust