--- a/PeekableStream.st	Sun Mar 21 17:58:43 2010 +0000
+++ b/PeekableStream.st	Sun Mar 21 19:37:43 2010 +0000
@@ -225,13 +225,18 @@
     "file in from the receiver, i.e. read chunks and evaluate them -
      return the value of the last chunk."
 
-    |notifiedLoader|
+    |notifiedLoader lastValue|
 
     SourceFileLoader notNil ifTrue:[
         notifiedLoader := SourceFileLoader on:self.
     ].
 
-    ^ self fileInNotifying:notifiedLoader passChunk:true.
+    Class nameSpaceQuerySignal handle:[:ex |
+        ex proceedWith:Smalltalk
+    ] do:[
+        lastValue := self fileInNotifying:notifiedLoader passChunk:true.
+    ].
+    ^ lastValue.
 !
 
 fileInBinary
@@ -1021,7 +1026,12 @@
 !PeekableStream class methodsFor:'documentation'!
 
 version
-    ^ '$Id: PeekableStream.st 10447 2009-06-14 13:09:55Z vranyj1 $'
+    ^ '$Id: PeekableStream.st 10508 2010-03-21 19:37:43Z vranyj1 $'
+!
+
+version_CVS
+    ^ '§Header: /cvs/stx/stx/libbasic/PeekableStream.st,v 1.39 2010/03/12 12:39:13 cg Exp §'
 ! !
 
 PeekableStream initialize!
+