This fixes #7796.  It now tests if it is null, instead of a string length.
Changed the version to rc1