@@ -337,13 +337,13 @@
 			return [_delegate stream: object
 			       didReadIntoBuffer: _buffer
 					  length: length];
 		} else {
 			if ([_delegate respondsToSelector:
-			    @selector(stream:didFailWithException:)])
-				[_delegate	  stream: object
-				    didFailWithException: exception];
+			    @selector(stream:didFailToReadWithException:)])
+				[_delegate		stream: object
+				    didFailToReadWithException: exception];
 
 			return false;
 		}
 # ifdef OF_HAVE_BLOCKS
 	}
@@ -401,13 +401,13 @@
 
 			_readLength = 0;
 			return true;
 		} else {
 			if ([_delegate respondsToSelector:
-			    @selector(stream:didFailWithException:)])
-				[_delegate	  stream: object
-				    didFailWithException: exception];
+			    @selector(stream:didFailToReadWithException:)])
+				[_delegate		stream: object
+				    didFailToReadWithException: exception];
 
 			return false;
 		}
 # ifdef OF_HAVE_BLOCKS
 	}
@@ -452,13 +452,13 @@
 
 			return [_delegate stream: object
 				     didReadLine: line];
 		} else {
 			if ([_delegate respondsToSelector:
-			    @selector(stream:didFailWithException:)])
-				[_delegate	  stream: object
-				    didFailWithException: exception];
+			    @selector(stream:didFailToReadWithException:)])
+				[_delegate		stream: object
+				    didFailToReadWithException: exception];
 
 			return false;
 		}
 # ifdef OF_HAVE_BLOCKS
 	}
@@ -519,13 +519,13 @@
 
 			_writtenLength = 0;
 			return true;
 		} else {
 			if ([_delegate respondsToSelector:
-			    @selector(stream:didFailWithException:)])
-				[_delegate	  stream: object
-				    didFailWithException: exception];
+			    @selector(stream:didFailToWriteWithException:)])
+				[_delegate		 stream: object
+				    didFailToWriteWithException: exception];
 
 			return false;
 		}
 # ifdef OF_HAVE_BLOCKS
 	}
@@ -589,13 +589,13 @@
 
 			return [_delegate socket: object
 				 didAcceptSocket: acceptedSocket];
 		} else {
 			if ([_delegate respondsToSelector:
-			    @selector(stream:didFailWithException:)])
-				[_delegate	  stream: object
-				    didFailWithException: exception];
+			    @selector(socket:didFailToAcceptWithException:)])
+				[_delegate		  socket: object
+				    didFailToAcceptWithException: exception];
 
 			return false;
 		}
 # ifdef OF_HAVE_BLOCKS
 	}