--- a/Filename.st	Wed Dec 04 15:24:56 2013 +0100
+++ b/Filename.st	Wed Dec 04 15:26:15 2013 +0100
@@ -2809,14 +2809,9 @@
                 "ignore the error - may occure when copying to a network drive"
             ].            
         ].
-        inStream binary.
-        outStream binary.
-
-        [
-            inStream copyToEndInto:outStream.
-        ] on:Error do:[:ex|
-            ^ self fileCreationError:newName
-        ]
+        inStream binary; buffered:false.
+        outStream binary; buffered:false.
+        inStream copyToEndInto:outStream.
     ] ensure:[
         inStream close.
         outStream notNil ifTrue:[outStream syncData; close].
@@ -3358,12 +3353,14 @@
             "ignore the error - may occure when copying to a network drive"
         ].            
 
-        inStream binary.
-        tempStream binary.
+        inStream binary; buffered:false.
+        tempStream binary; buffered:false.
         [
             inStream copyToEndInto:tempStream.
-        ] on:Error do:[:ex|
-            ^ self fileCreationError:newName
+        ] ifCurtailed:[
+            tempStream close.
+            tempStream fileName remove.
+            tempStream := nil.
         ].
         tempStream syncData.
     ] ensure:[
@@ -6066,11 +6063,11 @@
 !Filename class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/Filename.st,v 1.407 2013-11-21 15:58:10 ca Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/Filename.st,v 1.408 2013-12-04 14:26:15 stefan Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libbasic/Filename.st,v 1.407 2013-11-21 15:58:10 ca Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/Filename.st,v 1.408 2013-12-04 14:26:15 stefan Exp $'
 ! !