Its bad not to check for certificate.
minor clean up.