Adds server error reporting
Merge branch 'master' of github.com:colevoss/hp_metrics