Add more checks on client certificate authentication