Merge "Fix null check in hasSigningCertificate"