- attempt to fix null class error on Heroku
- attempt to fix null class error on Heroku
Merge branch 'heroku/master'