Only do flush error checking if there are notifications still in-flight
Merge branch 'sent-queue'