Adding some error checking
Merge branch 'master' of github.com:scraperwiki/custard