Merge "Adding error handling to pass V2_1 vts tests"