Add extra sessionStorage check