Change disconect method to avoid exception when not connected to anything