Add error handling via error_route and change for better thought and flow