FIXUP: simpler null test