--- a/AbstractOperatingSystem.st	Tue Dec 08 06:40:56 2015 +0100
+++ b/AbstractOperatingSystem.st	Thu Dec 10 06:39:39 2015 +0100
@@ -907,15 +907,15 @@
 shuffleAllFrom:anInStream to:anOutStream lineWise:lineWise lockWith:aLock
 
     lineWise ifFalse:[
-	^ anInStream copyToEndInto:anOutStream.
+        ^ anInStream copyToEndInto:anOutStream.
     ].
-    [anInStream atEnd] whileFalse:[
-	aLock critical:[
-	    self
-		shuffleFrom:anInStream
-		to:anOutStream
-		lineWise:lineWise
-	]
+    [anInStream isOpen and:[anInStream atEnd not]] whileTrue:[
+        aLock critical:[
+            self
+                shuffleFrom:anInStream
+                to:anOutStream
+                lineWise:lineWise
+        ]
     ]
 !