Avoid possible handler leaks