Fixed handler leak
Fixed lint error