Refinements to scraper failure-handling logic