@@ -29,11 +29,11 @@
 #import "OFArray.h"
 #import "OFMapTable.h"
 #import "OFNull.h"
 
 #import "OFInitializationFailedException.h"
-#import "OFObserveFailedException.h"
+#import "OFObserveKernelEventsFailedException.h"
 
 #define eventListSize 64
 
 static const OFMapTableFunctions mapFunctions = { NULL };
 
@@ -102,12 +102,13 @@
 	event.events = (int)events | addEvents;
 	event.data.ptr = object;
 
 	if (epoll_ctl(_epfd, (events == 0 ? EPOLL_CTL_ADD : EPOLL_CTL_MOD),
 	    fd, &event) == -1)
-		@throw [OFObserveFailedException exceptionWithObserver: self
-								 errNo: errno];
+		@throw [OFObserveKernelEventsFailedException
+		    exceptionWithObserver: self
+				    errNo: errno];
 
 	[_FDToEvents setObject: (void *)(events | addEvents)
 			forKey: (void *)((intptr_t)fd + 1)];
 }
 
@@ -127,11 +128,11 @@
 			 * When an async connect fails, it seems the socket is
 			 * automatically removed from epoll, meaning ENOENT is
 			 * returned when we try to remove it after it failed.
 			 */
 			if (errno != ENOENT)
-				@throw [OFObserveFailedException
+				@throw [OFObserveKernelEventsFailedException
 				    exceptionWithObserver: self
 						    errNo: errno];
 
 		[_FDToEvents removeObjectForKey: (void *)((intptr_t)fd + 1)];
 	} else {
@@ -140,11 +141,11 @@
 		memset(&event, 0, sizeof(event));
 		event.events = (int)events;
 		event.data.ptr = object;
 
 		if (epoll_ctl(_epfd, EPOLL_CTL_MOD, fd, &event) == -1)
-			@throw [OFObserveFailedException
+			@throw [OFObserveKernelEventsFailedException
 			    exceptionWithObserver: self
 					    errNo: errno];
 
 		[_FDToEvents setObject: (void *)events
 				forKey: (void *)((intptr_t)fd + 1)];
@@ -198,12 +199,13 @@
 
 	events = epoll_wait(_epfd, eventList, eventListSize,
 	    (timeInterval != -1 ? timeInterval * 1000 : -1));
 
 	if (events < 0)
-		@throw [OFObserveFailedException exceptionWithObserver: self
-								 errNo: errno];
+		@throw [OFObserveKernelEventsFailedException
+		    exceptionWithObserver: self
+				    errNo: errno];
 
 	for (int i = 0; i < events; i++) {
 		if (eventList[i].events & EPOLLIN) {
 			void *pool = objc_autoreleasePoolPush();