BUGFIX: Crash on disconnect