Account for possibly missing data structures
Fix typo
Merge pull request #18212 from cachedout/issue_18182

Fix typo
Merge pull request #18211 from techhat/httpstate

Account for possibly missing data structures