TIMOB-14590 Adding a null check.