make sure nav stack never empty (bug 1064631)
Merge pull request #648 from ngokevin/navfix

make sure nav stack never empty (bug 1064631)