added some error stuff
Merge branch 'master' of https://github.com/matt-way/churn-chrome-extension