Fixed possible Handler leaks.