After refactoring session expire is not handled properly