Error catching around session and navigation has been added