Show session expired instead of throwing exception (#4252)

Change-Id: Ic3ba079d91293fd804c3c95d6cc19fc6e3cf82cc