[Bug 424655] New: add-on tool doesn't clean itself up properly on cancel