better handling of session absence