Survive an in-session self-update without the error wall (#852)