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

[TIMOB-13560](3_1_X) Add nil check