diff --git a/ChangeLog b/ChangeLog
index f6c66ed9..215a2cde 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-10-06 00:16-EDT Gregory John Casamento <greg_casamento@yahoo.com>
+
+	* GormCore/GormClassEditor.m: Minor cleanup in handleNotification: 
+	method.
+
 2006-10-05 13:16-EDT Gregory John Casamento <greg_casamento@yahoo.com>
 
 	* English.lproj/GormClassEditor.gorm: Added new gorm file to hold
diff --git a/GormCore/GormClassEditor.m b/GormCore/GormClassEditor.m
index 8ff47dea..b8c28414 100644
--- a/GormCore/GormClassEditor.m
+++ b/GormCore/GormClassEditor.m
@@ -157,6 +157,10 @@ NSString *GormSwitchViewPreferencesNotification = @"GormSwitchViewPreferencesNot
 	      selector: @selector(handleNotification:)
 	      name: GormSwitchViewPreferencesNotification
 	      object: nil];
+	  [nc addObserver: self
+	      selector: @selector(handleNotification:)
+	      name: GormDidAddClassNotification
+	      object: nil];
 	  
 	  // kludge to prevent it from having resize issues.
 	  [classesView setContentView: scrollView];
@@ -207,7 +211,10 @@ NSString *GormSwitchViewPreferencesNotification = @"GormSwitchViewPreferencesNot
 
 - (void) handleNotification: (NSNotification *)notification
 {
-  [self switchView];
+  if([[notification name] isEqualToString: GormSwitchViewPreferencesNotification])
+    {
+      [self switchView];
+    }
 }
 
 - (void) browserClick: (id)sender
@@ -501,6 +508,9 @@ NSString *GormSwitchViewPreferencesNotification = @"GormSwitchViewPreferencesNot
       anitem = [[browserView selectedCell] stringValue];
     }
 
+  if(anitem == nil)
+    return;
+  
   if ([anitem isKindOfClass: [GormOutletActionHolder class]])
     {
       id itemBeingEdited = [outlineView itemBeingEdited];