[TIMOB-17648] nil check
Merge pull request #6070 from vishalduggal/timob-17648

[TIMOB-17648] nil check