Work around server crash