Hopefully fixed possible crash on connection removal