Handle infinite session timeout properly