Improved handling of Router error states