Don't update timer on error

Change-Id: I1d0ff940ea1bb70faadabb07da16819378abfc8b