Minor fix: make sure plugins return after session is reset