Adding per server return code reporting