diff --git a/TODO b/TODO
index 5730686358..29b70115a8 100644
--- a/TODO
+++ b/TODO
@@ -79,7 +79,7 @@
 
 * declare /etc/os-release cross-distro standard
 
-Pre v12:
+* rename s/session/user/g
 
 * fix hotplug transactions
 
diff --git a/src/manager.c b/src/manager.c
index a39427b1f6..204a88e791 100644
--- a/src/manager.c
+++ b/src/manager.c
@@ -2192,6 +2192,9 @@ static int process_event(Manager *m, struct epoll_event *ev) {
 
         assert(w = ev->data.ptr);
 
+        if (w->type == WATCH_INVALID)
+                return 0;
+
         switch (w->type) {
 
         case WATCH_SIGNAL: