push to heroku
added null condition exception