[TIMOB-13560] Add nil check
Merge pull request #4242 from vishalduggal/timob-13560

[TIMOB-13560] Add nil check