session check enhancement