TIMOB-9983-incorporated review comments about null check