v1.28.2: Remedy two race conditions

Fixes: #254

Or at least I hope so. I can't repro and the reporter can't repro, so
I believe that crash might be caused by a race. And since this release
fixes two race conditions, I hope I got it.

Impossible to know, fingers crossed.