Patches
Plain Diff
Removed unused session entry, made sure all error reset goes through the appropriate function. issue #5854