Change to server error detection