#2329 - handling no session