Merge "Deal With Error Response from Vfc"