Merge pull request #9502 from ctiller/fuzzing-fun

Fix fuzzing detected failure