Adding checks for avs fails