Base: Move timeout reset before new error message