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