catch errors
Merge branch 'master' of github.com:total-impact/total-impact-webapp