I still don't understand what happened to the OP in #16610 - I couldn't
reproduce it. However, this change makes it more defensive and should avoid
this problen.

Resolves #16610