TIMOB-14592 Adding a null check.