diff --git a/ChangeLog b/ChangeLog
index 56a44be13..85e058909 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-11-12 05:31-EST Gregory John Casamento <greg_casamento@yahoo.com>
+
+	* Source/GSNibCompatibility.m: Conditionally call setToolTip if it
+	exists when doing establishConnection on an NSIBHelpConnector.
+	* Source/NSDocumentController.m: Correction to prevent exception when
+	NSDocumentClass isn't specified.   This does not cause an issue on
+	Mac OS X.
+
 2008-11-11 Fred Kiefer <FredKiefer@gmx.de>
 
 	* Source/NSView.m (-setBoundsOrigin:, -setBoundsRotation:,
diff --git a/Source/GSNibCompatibility.m b/Source/GSNibCompatibility.m
index 9b6f49917..c6ffffe63 100644
--- a/Source/GSNibCompatibility.m
+++ b/Source/GSNibCompatibility.m
@@ -1566,7 +1566,10 @@ static BOOL _isInInterfaceBuilder = NO;
 
 - (void) establishConnection
 {
-  [_dst setToolTip: _marker];
+  if([_dst respondsToSelector: @selector(setToolTip:)])
+    {
+      [_dst setToolTip: _marker];
+    }
 }
 
 - (void) setFile: (id)file
diff --git a/Source/NSDocumentController.m b/Source/NSDocumentController.m
index 936c97371..678844586 100644
--- a/Source/NSDocumentController.m
+++ b/Source/NSDocumentController.m
@@ -1024,8 +1024,17 @@ static NSDictionary *TypeInfoForHumanReadableName (NSArray *types, NSString *typ
   for (i = 0; i < count; i++)
     {
       NSDictionary *typeInfo = [_types objectAtIndex: i];
-      
-      [classNames addObject: [typeInfo objectForKey: NSDocumentClassKey]];
+      NSString *className = [typeInfo objectForKey: NSDocumentClassKey];
+
+      if(className != nil)
+	{
+	  [classNames addObject: className];
+	}
+      else
+	{
+	  NSLog(@"WARN: The entry does not have an NSDocumentClass name defined: %@",
+		typeInfo);
+	}
     }
  
   return AUTORELEASE(classNames);