--- a/ChangeSetBrowser.st	Sat Jan 29 11:49:05 2011 +0100
+++ b/ChangeSetBrowser.st	Sat Jan 29 12:59:19 2011 +0100
@@ -730,7 +730,7 @@
 !
 
 applyPossiblyModifiedChange:aChange
-    |ns superClass superClassName|
+    |ns superClass superClassName savedClassName|
 
     aChange isClassDefinitionChange ifTrue:[
         superClassName := aChange superClassName.
@@ -770,22 +770,20 @@
             ].
         ].
     ].
-    enforcedNameSpace notNil ifTrue:[
-        |sav|
-
+    (enforcedNameSpace notNil and:[(savedClassName := aChange className) notNil]) ifTrue:[
         [
-            sav := aChange className.
-            Error ignoreIn:[ aChange class:(enforcedNameSpace classNamed:sav) ].
-            aChange className:(enforcedNameSpace name,'::',sav).
+
+            Error ignoreIn:[ aChange class:(enforcedNameSpace classNamed:savedClassName) ].
+            aChange className:(enforcedNameSpace name,'::',savedClassName).
             aChange apply.
         ] ensure:[
-            aChange className:sav
+            aChange className:savedClassName
         ].
     ] ifFalse:[
         aChange apply.
     ].
 
-    "Modified: / 03-03-2007 / 10:29:50 / cg"
+    "Modified: / 29-01-2011 / 12:30:35 / cg"
 !
 
 changeIsFollowupMethodChange:changeNr
@@ -1030,9 +1028,9 @@
 !ChangeSetBrowser class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/ChangeSetBrowser.st,v 1.54 2011-01-29 10:49:05 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/ChangeSetBrowser.st,v 1.55 2011-01-29 11:59:19 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/ChangeSetBrowser.st,v 1.54 2011-01-29 10:49:05 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/ChangeSetBrowser.st,v 1.55 2011-01-29 11:59:19 cg Exp $'
 ! !