Another attempt at fixing unhandled routes.