Less ugly timeout on NewSession