handle npe
Merge remote-tracking branch 'heroku-staging/master'