diff --git a/ChangeLog b/ChangeLog
index a0b24591..a6d42cdc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2003-09-08  Gregory John Casamento <greg_casamento@yahoo.com>
+
+	* GormClassManager.m: [nonCustomSuperClassOf:] if the class
+	passed in is not custom it will return the immediate superclass
+	of that class.   This is to allow the use of the custom class
+	mechanism to select classes which are not custom but are not
+	offered in the palettes (i.e. NSSecureTextField).
+
 2003-09-08  Gregory John Casamento <greg_casamento@yahoo.com>
 
 	* GormViewWindow.[hm]: Provides a holder for standalone views
diff --git a/GormClassManager.m b/GormClassManager.m
index e62e4bbd..2ec0fe02 100644
--- a/GormClassManager.m
+++ b/GormClassManager.m
@@ -1401,14 +1401,19 @@
 {
   NSString *result = className;
   
-  NSAssert([self isCustomClass: className],NSInvalidArgumentException);
-
-  // iterate up the chain until a non-custom superclass is found...
-  while ([self isCustomClass: result])
+  if(![self isCustomClass: className] && ![className isEqual: @"NSObject"])
     {
-      NSDebugLog(@"result = %@",result);
       result = [self superClassNameForClassNamed: result];
     }
+  else
+    {
+      // iterate up the chain until a non-custom superclass is found...
+      while ([self isCustomClass: result])
+	{
+	  NSDebugLog(@"result = %@",result);
+	  result = [self superClassNameForClassNamed: result];
+	}
+    }
 
   return result;
 }