Fix bug in Z2 scraper and add some error handling