[TIMOB-14510] Avoid crash
Merge pull request #4841 from vishalduggal/timob-14510

[TIMOB-14510] Avoid crash