fixup on fp null check