I removed the ``null`` condition