empty route handling improved