Much better error handling
Merge branch 'master' into heroku