Handle leak fix for leaked token handle, avoid double close