Added checks for certificate/keypair in token