fixed null issue on heroku..