Adding a non-null element test (detected on Creeklink)