handle null
Merge branch 'for_palanteer' of https://github.com/linegroup/TweetStream.git into for_palanteer