--- a/Behavior.st	Mon Mar 25 23:04:02 2013 +0000
+++ b/Behavior.st	Wed Mar 27 12:24:15 2013 +0000
@@ -1057,7 +1057,13 @@
      These bytes are typically the result from storing into a string/stream.
      Same as readFrom:, for Dolphin compatibility."
 
-    ^ self readFrom:aString
+    |s result|
+
+    s := aString readStream.
+    result := self readFrom:s.
+"/ should check here for garbage - maybe later
+"/    s atEnd ifFalse:[^ ConversionError raiseRequestWith:aString errorString:' - garbage at end of ', self name].
+    ^ result
 !
 
 guid:aUUID
@@ -1194,6 +1200,7 @@
 ! !
 
 
+
 !Behavior methodsFor:'accessing'!
 
 addSelector:newSelector withMethod:newMethod
@@ -2693,13 +2700,13 @@
      This is the reverse operation to 'storeOn:'.
 
      WARNING: storeOn: does not handle circular references and multiple
-	      references to the same object.
-	      Use #storeBinary:/readBinaryFrom: for this."
+              references to the same object.
+              Use #storeBinary:/readBinaryFrom: for this."
 
     ^ self
-	readFrom:aStream
-	onError:[ self conversionErrorSignal
-		    raiseErrorString:'conversion error for: ' , self name ]
+        readFrom:aStream
+        onError:[ self conversionErrorSignal
+                    raiseWith:aStream errorString:'conversion error for: ' , self name ]
 
     "
      |s|
@@ -4885,10 +4892,10 @@
 !Behavior class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/Behavior.st,v 1.331 2013-01-24 15:50:52 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/Behavior.st,v 1.332 2013-03-26 17:04:47 stefan Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libbasic/Behavior.st,v 1.331 2013-01-24 15:50:52 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/Behavior.st,v 1.332 2013-03-26 17:04:47 stefan Exp $'
 ! !