More router ERROR status polling cleanup.