Fixed bug where disconnect would fire on a nonetype