Fixes deployment errors on heroku
Fix NPE
Add logs