Don't reference comments that do not exist
Merge pull request #15413 from sgrif/sg-i-wish-i-could

Don't reference comments that do not exist