more ClosedByInterruptException handling