Tweak wrapped_next to handle errors properly