Merge pull request #2234 from nnnick/fix/2223

Don't measure undefined or null strings.