diff --git a/ChangeLog b/ChangeLog
index fd45d7812..0f61ae741 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-06-29  Richard Frith-Macdonald <rfm@gnu.org>
+
+	* Source/NSObject.m: ([-respondsToSelector:]) handle nul selectors.
+	Bug report by Andy Ruder <aeruder@yahoo.com>
+
 2002-06-28  Richard Frith-Macdonald <rfm@gnu.org>
 
 	* Source/NSString.m: Change to quote strings in plist output
diff --git a/Source/NSObject.m b/Source/NSObject.m
index 951419a2e..4b2a838d9 100644
--- a/Source/NSObject.m
+++ b/Source/NSObject.m
@@ -1399,6 +1399,10 @@ static BOOL double_release_check_enabled = NO;
  */
 - (BOOL) respondsToSelector: (SEL)aSelector
 {
+  if (aSelector == 0)
+    {
+      return NO;
+    }
   return __objc_responds_to(self, aSelector);
 }