This is a fix on top of the previous issue fixed in
c917965b.

This was caught by "libFuzzer" testing.