Improved session expired managment