improved handling of DeadlineExceededErrors