--- a/Timestamp.st	Tue Dec 02 11:57:01 2014 +0100
+++ b/Timestamp.st	Tue Dec 02 13:38:09 2014 +0100
@@ -425,7 +425,6 @@
     "Modified: / 13.7.1999 / 12:30:26 / stefan"
 ! !
 
-
 !Timestamp class methodsFor:'private'!
 
 basicReadFrom:aStream
@@ -1542,7 +1541,7 @@
 
 utcOffsetFrom:aStringOrStream
     "return the utcOffset (in seconds) for a given time-zone name.
-     Returns nil for invalid formats.
+     Returns nil for invalid formats, 0 if no timezone offset is present.
 
      Notice: this returns the negated value of what is read from a printed representation,
      which means that the sign is the same as what the utcOffset instance variable
@@ -1584,6 +1583,7 @@
         ] ifFalse:[
             stream skipSeparators
         ]].
+        stream peekOrNil isDigit ifFalse:[^ nil].
 
         offset := ((stream next:2) asNumber * 60 * 60).
         ch := stream peekOrNil.
@@ -1622,7 +1622,6 @@
     "
 ! !
 
-
 !Timestamp methodsFor:'accessing'!
 
 day
@@ -2930,8 +2929,6 @@
     "
 ! !
 
-
-
 !Timestamp methodsFor:'testing'!
 
 isLocalTimestamp
@@ -3909,11 +3906,11 @@
 !Timestamp class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/Timestamp.st,v 1.210 2014-11-27 10:11:01 stefan Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/Timestamp.st,v 1.211 2014-12-02 12:38:09 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libbasic/Timestamp.st,v 1.210 2014-11-27 10:11:01 stefan Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/Timestamp.st,v 1.211 2014-12-02 12:38:09 cg Exp $'
 ! !