Merge "Fix attestation error checks"