make sure we call next when stop is called, even if we have errors