[Bug 754329] New: Make clock handling more robust