Change run location for Heroku
Simplify error logic