--- a/Timestamp.st	Fri May 20 06:45:01 2016 +0200
+++ b/Timestamp.st	Mon May 23 07:53:04 2016 +0100
@@ -141,30 +141,30 @@
     "decode a Timestamp literalArray.
 
      anArray may be:
-	#(Timestamp '200004182000.123')
+        #(Timestamp '200004182000.123')
 
      or the deprecated old format, that is not portable between different architectures.
      We parse this for backward compatibility (will be eventually removed).
 
-	#(Timestamp #osTime: 12345678)
+        #(Timestamp #osTime: 12345678)
     "
 
     (anArray at:2) == #osTime: ifTrue:[
-	^ self new osTime:(anArray at:3).
+        ^ self new osTime:(anArray at:3).
     ].
 
     ^ self
-	readGeneralizedFrom:(anArray at:2)
-	onError:[ self conversionErrorSignal
-		    raiseErrorString:'literal array decoding' ]
+        readGeneralizedFrom:(anArray at:2)
+        onError:[ self conversionErrorSignal
+                    raiseWith:anArray errorString:' - Timestamp literal array decoding' ]
 
     "
      Timestamp
-	decodeFromLiteralArray:#(Timestamp '20050323175226.014')
+        decodeFromLiteralArray:#(Timestamp '20050323175226.014')
      Timestamp
-	decodeFromLiteralArray:#(Timestamp '20050323175226.014-01')
+        decodeFromLiteralArray:#(Timestamp '20050323175226.014-01')
      Timestamp
-	decodeFromLiteralArray:#(Timestamp '20050323175226.014Z')
+        decodeFromLiteralArray:#(Timestamp '20050323175226.014Z')
     "
 !
 
@@ -1063,9 +1063,9 @@
 readGeneralizedFrom:aStringOrStream
     "return a new Timestamp, reading a printed representation from aStream.
      The format read here is either
-	yyyymmddHHMMSS.iii+uuuu, which is the ASN1 GeneralizedTime format.
+        yyyymmddHHMMSS.iii+uuuu, which is the ASN1 GeneralizedTime format.
      or:
-	yyyy-mm-dd HH:MM:SS.iii +uuuu.
+        yyyy-mm-dd HH:MM:SS.iii +uuuu.
      The string is interpreted as 24 hour format, as printed.
 
      This format is used for BER specification of the ASN.1 GeneralizedTime as defined in X.208 Sec. 33,
@@ -1078,11 +1078,11 @@
     "
 
     ^ self
-	readGeneralizedFrom:aStringOrStream
-	short:false
-	onError:[
-	    self conversionErrorSignal raiseErrorString:'Timestamp format error'
-	].
+        readGeneralizedFrom:aStringOrStream
+        short:false
+        onError:[
+            self conversionErrorSignal raiseWith:aStringOrStream errorString:' - Timestamp GeneralizedTime format error'
+        ].
 
     "Created: / 22-08-2006 / 16:05:55 / cg"
 !