fix some InterruptException handling