not sure why we want to allow stop() to fail if sessionOverride is null. most often, sessionOverride is indeed null. I do think it's a good idea to add the line in cleanupSession that you did, however.