nil check
Merge pull request #6069 from vishalduggal/timob-17648-34X

[TIMOB-17648] nil check