Fix intermittent nil dereference error#5648

Merged

deepthi merged 2 commits intovitessio:masterfrom

planetscale:ds-fix-srvtopo-test

Jan 3, 2020

Commits on Jan 2, 2020

don't use err.Error() when err can be nil
deepthi
committed

Commits on Jan 3, 2020

make test non-flaky
deepthi
committed