Scraper now ends gracefully (theoretically)