Refine session-checking on navigation