CID-1251369: not null check changed to null check