More protection for ClosedByInterruptException