diff --git a/ChangeLog b/ChangeLog
index 15bb9db6..8c43a480 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-12-23 06:03 Gregory John Casamento <greg_casamento@yahoo.com>
+
+	* GormClassInspector.m: Fix for issue when loading from gmodel.
+	Corrected _refreshView: and searchForClass: so that if list is nil,
+	the selection isn't set.
+	* Gorm.spec.in: Minor correction.
+
 2004-12-19 09:05 Gregory John Casamento <greg_casamento@yahoo.com>
 
 	* GormInspectorsManager.m: Added [super init] call to
diff --git a/Gorm.spec.in b/Gorm.spec.in
index 3ee79748..5a4f70a7 100644
--- a/Gorm.spec.in
+++ b/Gorm.spec.in
@@ -6,7 +6,7 @@ Source: ftp://ftp.gnustep.org/pub/gnustep/dev-apps/%{gs_name}-%{gs_version}.tar.
 Requires: gnustep-gui
 
 %description 
-Gorm is an acronym for GNUstep/Graphic Object Relationship modeler.  
+Gorm is an acronym for GNUstep/Graphical Object Relationship Modeler.  
 It is a clone of the NeXTstep `Interface Builder' application for GNUstep.
 With Gorm, a developer can build an interface very quickly and easily with
 no code. 
diff --git a/GormClassInspector.m b/GormClassInspector.m
index 2f0db530..4a64f21b 100644
--- a/GormClassInspector.m
+++ b/GormClassInspector.m
@@ -334,7 +334,7 @@ objectValueForTableColumn: (NSTableColumn *)tc
   [classField setBackgroundColor: ((isEditable && !isFirstResponder)?[NSColor whiteColor]:[NSColor lightGrayColor])];
 
   // select the parent class
-  if(index != NSNotFound)
+  if(index != NSNotFound && list != nil)
     {
       [parentClass selectRow: index byExtendingSelection: NO];
       [parentClass scrollRowToVisible: index];
@@ -460,7 +460,8 @@ objectValueForTableColumn: (NSTableColumn *)tc
   int index = [list indexOfObject: stringValue];
 
   NSLog(@"Search... %@",[searchText stringValue]);
-  if(index != NSNotFound && [stringValue isEqualToString: @"FirstResponder"] == NO)
+  if(index != NSNotFound && list != nil && 
+     [stringValue isEqualToString: @"FirstResponder"] == NO)
     {
       // select the parent class
       [parentClass selectRow: index byExtendingSelection: NO];