Add error handling so we're not pulling down 404 pages