diff --git a/src/private.h b/src/private.h
index 3582137..2789f48 100644
--- a/src/private.h
+++ b/src/private.h
@@ -44,7 +44,6 @@ typedef enum {
 typedef struct {
 	int             running;
 	int             fd;     /* For epoll() */
-	uint32_t        errors;
 	LIST_HEAD(,uev) watchers;
 	uint32_t        workaround; /* For workarounds, e.g. redirected stdin */
 } uev_ctx_t;
diff --git a/src/uev.c b/src/uev.c
index 3973f85..63fe05e 100644
--- a/src/uev.c
+++ b/src/uev.c
@@ -330,39 +330,6 @@ int uev_run(uev_ctx_t *ctx, int flags)
 			w = (uev_t *)ee[i].data.ptr;
 			events = ee[i].events;
 
-			if (events & (EPOLLHUP | EPOLLERR)) {
-				ctx->errors++;
-
-				if (ctx->errors >= 42) {
-					uev_t *tmp, *retry = w;
-
-					/* If not valid anymore, try to remove, ignore any errors. */
-					if (!is_valid_fd(w->fd))
-						_uev_watcher_stop(w);
-
-					/* Must recreate epoll fd now ... */
-					if (_init(ctx, 1)) {
-						/* Catastrophic error, no way to recover. */
-						uev_exit(ctx);
-						return -3;
-					}
-
-					/* Restart watchers in new efd */
-					LIST_FOREACH_SAFE(w, &ctx->watchers, link, tmp) {
-						if (_uev_watcher_active(w)) {
-							w->active = 0;
-							LIST_REMOVE(w, link);
-							_uev_watcher_start(w);
-						}
-					}
-					_uev_watcher_start(retry);
-
-					/* New efd, restart everything! */
-					ctx->errors = 0;
-					continue;
-				}
-			}
-
 			switch (w->type) {
 			case UEV_CRON_TYPE:
 				if (read(w->fd, &exp, sizeof(exp)) != sizeof(exp)) {
@@ -397,6 +364,13 @@ int uev_run(uev_ctx_t *ctx, int flags)
 					}
 				}
 				break;
+
+			case UEV_IO_TYPE:
+				if (events & (EPOLLHUP | EPOLLERR)) {
+					if (!is_valid_fd(w->fd))
+						uev_io_stop(w);
+				}
+				break;
 			}
 
 			if (w->cb)