--- a/ClassDefinitionChange.st	Tue Mar 05 12:38:34 2013 +0100
+++ b/ClassDefinitionChange.st	Tue Mar 05 12:39:02 2013 +0100
@@ -50,7 +50,7 @@
 !ClassDefinitionChange class methodsFor:'others'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libbasic3/ClassDefinitionChange.st,v 1.72 2012-08-10 10:09:30 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic3/ClassDefinitionChange.st,v 1.73 2013-03-05 11:39:02 stefan Exp $'
 ! !
 
 !ClassDefinitionChange methodsFor:'accessing'!
@@ -286,18 +286,23 @@
 !ClassDefinitionChange methodsFor:'applying'!
 
 apply
+    |changeClass|
+
     superClassName isNil ifTrue:[
         self setupFromSource
-    ].
-    superClassName isNil ifTrue:[
-        self error:'Should not happen'
+        superClassName isNil ifTrue:[
+            self error:'Should not happen'
+        ].
     ].
     (Smalltalk classNamed:superClassName) isNil ifTrue:[
         Class undeclared:superClassName
     ].
-    Parser evaluate:(self source).       
+    Parser evaluate:self source.       
     package notNil ifTrue:[
-        self changeClass setPackage:package.
+        changeClass := self changeClass.
+        changeClass notNil ifTrue:[
+            changeClass setPackage:package.
+        ].
     ].
 
     "
@@ -761,9 +766,10 @@
 !ClassDefinitionChange class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic3/ClassDefinitionChange.st,v 1.72 2012-08-10 10:09:30 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic3/ClassDefinitionChange.st,v 1.73 2013-03-05 11:39:02 stefan Exp $'
 !
 
 version_SVN
     ^ '§Id:: ClassDefinitionChange.st 1936 2012-07-24 15:47:21Z vranyj1                                                             §'
 ! !
+