clean-up session components correctly on failure