Merge pull request #36 from johnb30/master

Check database before scraping. Fix other errors.