--- a/ChangeSet.st	Thu May 24 14:56:23 2018 +0200
+++ b/ChangeSet.st	Thu May 24 14:57:33 2018 +0200
@@ -1,3 +1,5 @@
+"{ Encoding: utf8 }"
+
 "
  COPYRIGHT (c) 1993 by Claus Gittinger
 	      All Rights Reserved
@@ -940,7 +942,7 @@
                                         reader inputStream: encodedStream.
                                     ].
                                 ] ifFalse:[
-                                    self error:'unexpected change-chunk' mayProceed:true
+                                    self proceedableError:'unexpected change-chunk'
                                 ]
                             ] ifFalse:[
                                 tree isMessage ifTrue:[
@@ -975,6 +977,7 @@
     "Created: / 16-02-1998 / 12:19:34 / cg"
     "Modified: / 30-07-2013 / 21:34:16 / cg"
     "Modified: / 14-03-2014 / 16:39:47 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 24-05-2018 / 14:54:07 / Claus Gittinger"
 ! !
 
 !ChangeSet class methodsFor:'queries'!
@@ -2614,13 +2617,13 @@
 
 extractMethodsClassAndSelectorFromReceiver
     "helper for all changes which are of the form:
-	(className compiledMethodAt:#methodSelector) something: ...
+        (className compiledMethodAt:#methodSelector) something: ...
     "
 
     (receiver isMessage
     and:[receiverSelector == #'compiledMethodAt:']) ifFalse:[
-	self error:'unexpected change' mayProceed:true.
-	^ false.
+        self proceedableError:'unexpected change'.
+        ^ false.
     ].
 
     "/ className := self classNameOf:receiverReceiver.
@@ -2632,6 +2635,7 @@
     ^ true.
 
     "Created: / 27-07-2012 / 21:33:47 / cg"
+    "Modified: / 24-05-2018 / 14:54:14 / Claus Gittinger"
 !
 
 receiversClassName
@@ -3086,10 +3090,10 @@
     |change|
 
     (self checkReceiverIsGlobalNamed:#Namespace) ifFalse:[
-	(self checkReceiverIsGlobalNamed:#NameSpace) ifFalse:[
-	    self error:'unexpected receiver in nameSpace message' mayProceed:true.
-	    ^ false
-	].
+        (self checkReceiverIsGlobalNamed:#NameSpace) ifFalse:[
+            self proceedableError:'unexpected receiver in nameSpace message'.
+            ^ false
+        ].
     ].
 
     className := (arguments at:1) evaluate.
@@ -3098,6 +3102,8 @@
     change name:className.
     self addChange:change.
     ^ true
+
+    "Modified: / 24-05-2018 / 14:54:21 / Claus Gittinger"
 !
 
 handlePrimitiveChange
@@ -3140,8 +3146,8 @@
     |change|
 
     (self checkReceiverIsGlobalNamed:#Smalltalk) ifFalse:[
-	self error:'unexpected receiver in remove-class message' mayProceed:true.
-	^ false
+        self proceedableError:'unexpected receiver in remove-class message'.
+        ^ false
     ].
 
     className := (arguments at:1) name.
@@ -3153,6 +3159,8 @@
     change className:className.
     self addChange:change.
     ^ true
+
+    "Modified: / 24-05-2018 / 14:54:29 / Claus Gittinger"
 !
 
 handleRemoveMethodChange
@@ -3171,8 +3179,8 @@
     |oldName newName change|
 
     (self checkReceiverIsGlobalNamed:#Smalltalk) ifFalse:[
-	self error:'unexpected receiver in rename-class message' mayProceed:true.
-	^ false.
+        self proceedableError:'unexpected receiver in rename-class message'.
+        ^ false.
     ].
 
     oldName := (arguments at:1) name.
@@ -3181,6 +3189,8 @@
     change := ClassRenameChange new oldName:oldName newName:newName.
     self addChange:change.
     ^ true
+
+    "Modified: / 24-05-2018 / 14:54:36 / Claus Gittinger"
 !
 
 handleSqueakCommentStamp
@@ -5103,14 +5113,14 @@
     |nameSpace change|
 
     (self checkReceiverIsGlobalNamed:#Class) ifFalse:[
-	self error:'unexpected receiver in classDefinition message' mayProceed:true.
-	^ false.
+        self proceedableError:'unexpected receiver in classDefinition message'.
+        ^ false.
     ].
     className := (arguments at:1) evaluate.
 
     nameSpace := Class nameSpaceQuerySignal query.
     nameSpace ~~ Smalltalk ifTrue:[
-	className := nameSpace name , '::' , className
+        className := nameSpace name , '::' , className
     ].
 
     change := ClassDefinitionChange new.
@@ -5119,6 +5129,8 @@
     change package:(Class packageQuerySignal query).
     self addChange:change.
     ^ true
+
+    "Modified: / 24-05-2018 / 14:54:45 / Claus Gittinger"
 !
 
 handleMethodChange:isMeta