Added calls to expiredSession() and serverError()