FIXUP - Check for one more NULL.