From Andrei:

Just tried your patch - it does not fix the problem. Istill have crash
on exit. I will debug it more.