@@ -48,11 +48,11 @@
 
 @interface OFHTTPServer ()
 - (bool)of_socket: (OFTCPSocket *)socket
   didAcceptSocket: (OFTCPSocket *)clientSocket
 	  context: (id)context
-	exception: (OFException *)exception;
+	exception: (id)exception;
 @end
 
 static const char *
 statusCodeToString(short code)
 {
@@ -342,18 +342,18 @@
 - initWithSocket: (OFTCPSocket *)socket
 	  server: (OFHTTPServer *)server;
 - (bool)socket: (OFTCPSocket *)socket
    didReadLine: (OFString *)line
        context: (id)context
-     exception: (OFException *)exception;
+     exception: (id)exception;
 - (bool)parseProlog: (OFString *)line;
 - (bool)parseHeaders: (OFString *)line;
 -      (bool)socket: (OFTCPSocket *)socket
   didReadIntoBuffer: (char *)buffer
 	     length: (size_t)length
 	    context: (id)context
-	  exception: (OFException *)exception;
+	  exception: (id)exception;
 - (bool)sendErrorAndClose: (short)statusCode;
 - (void)createResponse;
 @end
 
 @implementation OFHTTPServer_Connection
@@ -397,11 +397,11 @@
 }
 
 - (bool)socket: (OFTCPSocket *)socket
    didReadLine: (OFString *)line
        context: (id)context
-     exception: (OFException *)exception
+     exception: (id)exception
 {
 	if (line == nil || exception != nil)
 		return false;
 
 	@try {
@@ -577,11 +577,11 @@
 
 -      (bool)socket: (OFTCPSocket *)socket
   didReadIntoBuffer: (char *)buffer
 	     length: (size_t)length
 	    context: (id)context
-	  exception: (OFException *)exception
+	  exception: (id)exception
 {
 	if ([socket isAtEndOfStream] || exception != nil)
 		return false;
 
 	[_body addItems: buffer
@@ -742,11 +742,11 @@
 }
 
 - (bool)of_socket: (OFTCPSocket *)socket
   didAcceptSocket: (OFTCPSocket *)clientSocket
 	  context: (id)context
-	exception: (OFException *)exception
+	exception: (id)exception
 {
 	OFHTTPServer_Connection *connection;
 
 	if (exception != nil) {
 		if ([_delegate respondsToSelector: