Refactored scraper module more to handle errors properly.