moved cancel to ensure that timer get terminated even if an Error occurs
moved cancel to ensure that timer get terminated even if an Error occurs

fandor/BubbleWrap,hboon/BubbleWrap,andersennl/BubbleWrap,dam13n/BubbleWrap,earthrid/BubbleWrap