This avoids crashes if the server returns unexpected results. The test should just report the failure in that case.
Created attachment 13989 [details] Patch for 4.8 cherry-picked from master
Pushed to autobuild-v4-8-test.
Pushed to v4-8-test. Closing out bug report. Thanks!