smarter interrupt handling when inside cleanup