Make sure we don't end up with a stale transaction
It seems to be a crash some people get sometimes, better safe than sorry.
BUG: 394737