--- a/Metaclass.st	Sun Apr 02 13:07:58 1995 +0200
+++ b/Metaclass.st	Tue Apr 11 16:52:00 1995 +0200
@@ -21,7 +21,7 @@
 COPYRIGHT (c) 1988 by Claus Gittinger
 	      All Rights Reserved
 
-$Header: /cvs/stx/stx/libbasic/Metaclass.st,v 1.22 1995-03-25 01:22:57 claus Exp $
+$Header: /cvs/stx/stx/libbasic/Metaclass.st,v 1.23 1995-04-11 14:49:45 claus Exp $
 '!
 
 !Metaclass class methodsFor:'documentation'!
@@ -42,7 +42,7 @@
 
 version
 "
-$Header: /cvs/stx/stx/libbasic/Metaclass.st,v 1.22 1995-03-25 01:22:57 claus Exp $
+$Header: /cvs/stx/stx/libbasic/Metaclass.st,v 1.23 1995-04-11 14:49:45 claus Exp $
 "
 !
 
@@ -80,7 +80,8 @@
     |newClass newMetaclass nInstVars nameString classSymbol oldClass 
      classVarChange instVarChange superClassChange newComment
      changeSet1 changeSet2 addedNames
-     anyChange oldInstVars newInstVars oldClassVars newClassVars superFlags newFlags|
+     anyChange oldInstVars newInstVars oldClassVars newClassVars superFlags newFlags
+     currentProject|
 
     "NOTICE:
      this method is too complex and should be splitted into managable pieces ...
@@ -180,8 +181,12 @@
     newMetaclass setName:(nameString , 'class') asSymbol.
     newMetaclass classVariableString:'' "stringOfClassVarNames".
 "/    newMetaclass setComment:newComment category:categoryString.
+
     Project notNil ifTrue:[
-	newMetaclass package:(Project current packageName)
+	currentProject := Project current.
+        currentProject notNil ifTrue:[
+	    newMetaclass package:(currentProject packageName)
+	]
     ].
 
     "then let the new meta create the class"
@@ -261,11 +266,14 @@
 	aSystemDictionary at:classSymbol put:newClass.
 
 	oldClass isNil ifTrue:[
-	    Project current notNil ifTrue:[
-		"
-		 new classes get the package assigned
-		"
-		newClass package:(Project current packageName asSymbol)
+	    Project notNil ifTrue:[
+	        currentProject := Project current.
+	        currentProject notNil ifTrue:[
+		    "
+		     new classes get the package assigned
+		    "
+		    newClass package:(currentProject packageName asSymbol)
+		]
 	    ].
 	].