Merge pull request #269 from haberman/fuzz-fix

Fixed a bug found by fuzzing.