diff --git a/CHANGES b/CHANGES
index 9e4bb8089..fbb08a0be 100644
--- a/CHANGES
+++ b/CHANGES
@@ -10,6 +10,9 @@ Daniel Stenberg (27 May 2009)
 - Frank McGeough provided a small OpenSSL #include fix to make libcurl compile
   fine with Nokia 5th edition 1.0 SDK for Symbian.
 
+- Andre Guibert de Bruet found a call to a OpenSSL function that didn't check
+  for a failure properly.
+
 Daniel Stenberg (25 May 2009)
 - bug report #2796358 (http://curl.haxx.se/bug/view.cgi?id=2796358) pointed
   out that the cookie parser would leak memory when it parses cookies that are
diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 2d5f8d5f1..8d1f2591b 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -24,6 +24,6 @@ This release includes the following known bugs:
 This release would not have looked like this without help, code, reports and
 advice from friends like these:
 
- Kamil Dudka, Caolan McNamara, Frank McGeough
+ Kamil Dudka, Caolan McNamara, Frank McGeough, Andre Guibert de Bruet
 
         Thanks! (and sorry if I forgot to mention someone)
diff --git a/lib/ssluse.c b/lib/ssluse.c
index 6cb2c8462..90bdfc262 100644
--- a/lib/ssluse.c
+++ b/lib/ssluse.c
@@ -1789,11 +1789,14 @@ static int X509V3_ext(struct SessionHandle *data,
   for (i=0; i<sk_X509_EXTENSION_num(exts); i++) {
     ASN1_OBJECT *obj;
     X509_EXTENSION *ext = sk_X509_EXTENSION_value(exts, i);
-    BIO *bio_out = BIO_new(BIO_s_mem());
     BUF_MEM *biomem;
     char buf[512];
     char *ptr=buf;
     char namebuf[128];
+    BIO *bio_out = BIO_new(BIO_s_mem());
+
+    if(!bio_out)
+      return 1;
 
     obj = X509_EXTENSION_get_object(ext);