Fix some more crashes at session-close