Added orDefault() to tools and used it in session check