Make sure we handle errors on skipping correctly