timob-16918: added null check.