diff -u -p a/demos/cms/cms_ddec.c b/demos/cms/cms_ddec.c
--- a/demos/cms/cms_ddec.c 2009-04-30 13:22:27.000000000 +0200
+++ b/demos/cms/cms_ddec.c 2009-04-30 15:11:11.000000000 +0200
@@ -47,8 +47,6 @@ int main(int argc, char **argv)
 	/* Open file containing detached content */
 	dcont = BIO_new_file("smencr.out", "rb");
 
-	if (!in)
-		goto err;
 
 	out = BIO_new_file("encrout.txt", "w");
 	if (!out)
diff -u -p a/apps/ecparam.c b/apps/ecparam.c
--- a/apps/ecparam.c 2009-04-30 13:22:25.000000000 +0200
+++ b/apps/ecparam.c 2009-04-30 15:21:24.000000000 +0200
@@ -464,8 +464,6 @@ bad:
 
 	if (check)
 		{
-		if (group == NULL)
-			BIO_printf(bio_err, "no elliptic curve parameters\n");
 		BIO_printf(bio_err, "checking elliptic curve parameters: ");
 		if (!EC_GROUP_check(group, NULL))
 			{
diff -u -p a/apps/ca.c b/apps/ca.c
--- a/apps/ca.c 2009-04-30 13:22:25.000000000 +0200
+++ b/apps/ca.c 2009-04-30 15:25:01.000000000 +0200
@@ -2189,7 +2189,6 @@ err:
 		X509_NAME_free(subject);
 	if ((dn_subject != NULL) && !email_dn)
 		X509_NAME_free(dn_subject);
-	if (tmptm != NULL)
 		ASN1_UTCTIME_free(tmptm);
 	if (ok <= 0)
 		{
diff -u -p a/crypto/asn1/a_d2i_fp.c b/crypto/asn1/a_d2i_fp.c
--- a/crypto/asn1/a_d2i_fp.c 2009-04-30 13:22:32.000000000 +0200
+++ b/crypto/asn1/a_d2i_fp.c 2009-04-30 15:10:43.000000000 +0200
@@ -255,6 +255,6 @@ static int asn1_d2i_read_bio(BIO *in, BU
 	*pb = b;
 	return off;
 err:
-	if (b != NULL) BUF_MEM_free(b);
+	 BUF_MEM_free(b);
 	return(ret);
 	}
diff -u -p a/crypto/err/err.c b/crypto/err/err.c
--- a/crypto/err/err.c 2009-04-30 13:22:31.000000000 +0200
+++ b/crypto/err/err.c 2009-04-30 15:11:20.000000000 +0200
@@ -586,11 +586,6 @@ static void build_SYS_str_reasons(void)
 	
 	CRYPTO_r_unlock(CRYPTO_LOCK_ERR);
 	CRYPTO_w_lock(CRYPTO_LOCK_ERR);
-	if (!init)
-		{
-		CRYPTO_w_unlock(CRYPTO_LOCK_ERR);
-		return;
-		}
 
 	for (i = 1; i <= NUM_SYS_STR_REASONS; i++)
 		{
diff -u -p a/crypto/cms/cms_lib.c b/crypto/cms/cms_lib.c
--- a/crypto/cms/cms_lib.c 2009-04-30 13:22:30.000000000 +0200
+++ b/crypto/cms/cms_lib.c 2009-04-30 15:11:29.000000000 +0200
@@ -464,8 +464,6 @@ int CMS_add0_cert(CMS_ContentInfo *cms, 
 	pcerts = cms_get0_certificate_choices(cms);
 	if (!pcerts)
 		return 0;
-	if (!pcerts)
-		return 0;
 	for (i = 0; i < sk_CMS_CertificateChoices_num(*pcerts); i++)
 		{
 		cch = sk_CMS_CertificateChoices_value(*pcerts, i);
diff -u -p a/crypto/objects/obj_lib.c b/crypto/objects/obj_lib.c
--- a/crypto/objects/obj_lib.c 2009-04-30 13:22:28.000000000 +0200
+++ b/crypto/objects/obj_lib.c 2009-04-30 15:12:30.000000000 +0200
@@ -115,7 +115,7 @@ err:
 	if (ln != NULL)		OPENSSL_free(ln);
 	if (sn != NULL)		OPENSSL_free(sn);
 	if (data != NULL)	OPENSSL_free(data);
-	if (r != NULL)		OPENSSL_free(r);
+			OPENSSL_free(r);
 	return(NULL);
 	}