Fix bug 1838 and crash dismiss route