Check for None
Merge pull request #11011 from cachedout/10971_fix

Check for None