Improve interruption handling.