diff --git a/ChangeLog b/ChangeLog
index 62eef99a1..7cd97ef08 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2001-05-07  Adam Fedor  <fedor@gnu.org>
+
+	* Source/NSApplication.m (_NSAppKitUncaughtExceptionHandler): Abort
+	when debug buttons is pressed (so gdb can do a bt).
+
+2001-05-06  Adam Fedor  <fedor@gnu.org>
+
+	* Source/NSBundleAdditions.m ([NSNibOutletConnector
+	-establishConnection]): Test for non-NULL sel (patch suggested by
+	Raphael Sebbe <raphael_sebbe@mac.com>).
+
 2000-05-08  Fred Kiefer <FredKiefer@gmx.de>
 
 	* Headers/gnustep/gui/NSTabViewItem.h
diff --git a/Source/NSApplication.m b/Source/NSApplication.m
index 19bb3fdff..3db8ac2f6 100644
--- a/Source/NSApplication.m
+++ b/Source/NSApplication.m
@@ -121,6 +121,11 @@ _NSAppKitUncaughtExceptionHandler (NSException *exception)
 	 library exception handler */
       [exception raise];
     }
+  else if (retVal == NSAlertOther)
+    {
+      /* Debug button: abort so we can trace the error in gdb */
+      abort();
+    }
 
   /* The user said to go on - more fun I guess - turn the AppKit
      exception handler on again */
diff --git a/Source/NSBundleAdditions.m b/Source/NSBundleAdditions.m
index 27b2720af..786ad3e5a 100644
--- a/Source/NSBundleAdditions.m
+++ b/Source/NSBundleAdditions.m
@@ -150,7 +150,7 @@
 	[_tag capitalizedString]];
       sel = NSSelectorFromString(selName);
 	      
-      if ([_src respondsToSelector: sel])
+      if (sel && [_src respondsToSelector: sel])
 	{
 	  [_src performSelector: sel withObject: _dst];
 	}
diff --git a/Source/tiff.m b/Source/tiff.m
index aa33d1dbb..60c39b726 100644
--- a/Source/tiff.m
+++ b/Source/tiff.m
@@ -68,7 +68,6 @@
 #ifndef __WIN32__
 #include <unistd.h>		/* for L_SET, etc definitions */
 #endif /* !__WIN32__ */
-#include <AppKit/nsimage-tiff.h>
 
 typedef struct {
   char* data;