--- a/Point.st	Fri May 12 14:35:09 1995 +0200
+++ b/Point.st	Tue May 16 19:09:45 1995 +0200
@@ -21,7 +21,7 @@
 COPYRIGHT (c) 1989 by Claus Gittinger
 	      All Rights Reserved
 
-$Header: /cvs/stx/stx/libbasic/Point.st,v 1.21 1995-05-08 03:30:26 claus Exp $
+$Header: /cvs/stx/stx/libbasic/Point.st,v 1.22 1995-05-16 17:08:22 claus Exp $
 '!
 
 !Point class methodsFor:'documentation'!
@@ -42,7 +42,7 @@
 
 version
 "
-$Header: /cvs/stx/stx/libbasic/Point.st,v 1.21 1995-05-08 03:30:26 claus Exp $
+$Header: /cvs/stx/stx/libbasic/Point.st,v 1.22 1995-05-16 17:08:22 claus Exp $
 "
 !
 
@@ -131,16 +131,22 @@
 
     |newX newY|
 
-    newX := Number readFrom:aStream onError:[^exceptionBlock value].
-    newX isNil ifTrue:[^ nil].
-    (aStream skipSeparators ~~ $@) ifTrue:[^nil].
-    aStream next.
-    newY := Number readFrom:aStream onError:[^exceptionBlock value].
-    newY isNil ifTrue:[^ nil].
-    ^ (self basicNew) x:newX y:newY
+    newX := Number readFrom:aStream onError:nil.
+    newX notNil ifTrue:[
+	(aStream skipSeparators == $@) ifTrue:[
+	    aStream next.
+	    newY := Number readFrom:aStream onError:nil.
+	    newY notNil ifTrue:[
+		^ (self basicNew) x:newX y:newY
+	    ]
+	]
+    ].
+    ^ exceptionBlock value
 
     "
      Point readFrom:('1.234 @ 5.678' readStream)
+     Point readFrom:('1' readStream)
+     Point readFrom:('1' readStream) onError:[1@1]
      Point readFrom:('fooBar' readStream) onError:[0@0]
     "  
 ! !