Backport "Timer: Handle Error Cases Properly" to v2.9.x