Tuned session buffer size, and added missing return.