fix crash at session-close, amend dec4790d