Make error checking more resilient to server changes