Add client close info & Fix memory leak