TIMOB-17016-Null check to avoid crash
Merge pull request #6044 from salachi/TIMOB-17016_New

TIMOB-17016-Null check to avoid crash