Updated to use routeChangeError