@@ -14,11 +14,10 @@
  * file.
  */
 
 #include "config.h"
 
-#define OF_STREAM_OBSERVER_M
 #define __NO_EXT_QNX
 
 #include <unistd.h>
 
 #include <assert.h>
@@ -387,12 +386,17 @@
 
 	for (i = 0; i < count; i++) {
 		if ([objects[i] pendingBytes] > 0 &&
 		    ![objects[i] OF_isWaitingForDelimiter]) {
 			void *pool = objc_autoreleasePoolPush();
-			[delegate streamIsReadyForReading: objects[i]];
+
+			if ([delegate respondsToSelector:
+			    @selector(streamIsReadyForReading:)])
+				[delegate streamIsReadyForReading: objects[i]];
+
 			foundInCache = YES;
+
 			objc_autoreleasePoolPop(pool);
 		}
 	}
 
 	/*
@@ -401,21 +405,7 @@
 	 */
 	if (foundInCache)
 		return YES;
 
 	return NO;
-}
-@end
-
-@implementation OFObject (OFStreamObserverDelegate)
-- (void)streamIsReadyForReading: (OFStream*)stream
-{
-}
-
-- (void)streamIsReadyForWriting: (OFStream*)stream
-{
-}
-
-- (void)streamDidReceiveException: (OFStream*)stream
-{
 }
 @end