TIMOB-5290-Review Comment, add null check