--- a/Class.st	Tue Jun 06 06:01:20 1995 +0200
+++ b/Class.st	Tue Jun 27 04:15:21 1995 +0200
@@ -21,7 +21,7 @@
 COPYRIGHT (c) 1989 by Claus Gittinger
 	      All Rights Reserved
 
-$Header: /cvs/stx/stx/libbasic/Class.st,v 1.45 1995-06-06 03:53:27 claus Exp $
+$Header: /cvs/stx/stx/libbasic/Class.st,v 1.46 1995-06-27 02:12:11 claus Exp $
 '!
 
 !Class class methodsFor:'documentation'!
@@ -42,7 +42,7 @@
 
 version
 "
-$Header: /cvs/stx/stx/libbasic/Class.st,v 1.45 1995-06-06 03:53:27 claus Exp $
+$Header: /cvs/stx/stx/libbasic/Class.st,v 1.46 1995-06-27 02:12:11 claus Exp $
 "
 !
 
@@ -689,8 +689,15 @@
     "set the comment and category of the class;
      do NOT create a change record"
 
+    |cat|
+
     comment := com.
-    category := categoryStringOrSymbol asSymbol
+    categoryStringOrSymbol isNil ifTrue:[
+	cat := ''
+    ] ifFalse:[
+	cat := categoryStringOrSymbol
+    ].
+    category := cat asSymbol
 !
 
 setClassVariableString:aString
@@ -841,6 +848,7 @@
     ].
     Transcript showCr:'unloading ' , name.
 
+    Autoload removeClass:self.    
     nm := name.
     Smalltalk at:nm put:nil.
     name := nm , ' (leftover)'.