diff --git a/TODO b/TODO
index 3daff295a5..b10c1723d2 100644
--- a/TODO
+++ b/TODO
@@ -1,4 +1,4 @@
-NuttX TODO List (Last updated September 18, 2018)
+NuttX TODO List (Last updated September 19, 2018)
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 This file summarizes known NuttX bugs, limitations, inconsistencies with
@@ -9,7 +9,7 @@ issues related to each board port.
 
 nuttx/:
 
- (16)  Task/Scheduler (sched/)
+ (15)  Task/Scheduler (sched/)
   (3)  SMP
   (1)  Memory Management (mm/)
   (0)  Power Management (drivers/pm)
@@ -367,16 +367,6 @@ o Task/Scheduler (sched/)
   Status:      Open
   Priority:    Low.  Does anyone actually use the sporadic scheduler?
 
-  Title:       PRIORITY INHERITANCE WITH ROUND ROBIN SCHEDULER
-  Description: Priority Inheritance:  (1) Round robin scheduling.. is boost
-               priority respected?  (2) Need to remember priority of the
-               highest priority waiting task.  We need this in several
-               places:  (a) Reprioritizing a task and (b) sporadic scheduler
-               when priority goes down.
-  Status:      Open
-  Priority:    Potentially high.  Need to determine if there really is an
-               issue with priority inheritance and the round robin scheduler.
-
   Title:       SIMPLIFY SPORADIC SCHEDULER DESIGN
   Description: I have been planning to re-implement sporadic scheduling for
                some time.  I believe that the current implementation is
diff --git a/fs/vfs/fs_poll.c b/fs/vfs/fs_poll.c
index 7494b751cf..9a7ba6d1a4 100644
--- a/fs/vfs/fs_poll.c
+++ b/fs/vfs/fs_poll.c
@@ -450,6 +450,8 @@ int poll(FAR struct pollfd *fds, nfds_t nfds, int timeout)
   int errcode;
   int ret;
 
+  DEBUGASSERT(fds != NULL);
+
   /* poll() is a cancellation point */
 
   (void)enter_cancellation_point();