Envoy handles edge-case errors a bit better now