diff --git a/library/x509_csr.c b/library/x509_csr.c
index 032b15c6..c8c08c8 100644
--- a/library/x509_csr.c
+++ b/library/x509_csr.c
@@ -282,13 +282,14 @@
                                        "-----BEGIN CERTIFICATE REQUEST-----",
                                        "-----END CERTIFICATE REQUEST-----",
                                        buf, NULL, 0, &use_len );
-        if( ret != 0 )
+        if( ret == MBEDTLS_ERR_PEM_NO_HEADER_FOOTER_PRESENT )
         {
             ret = mbedtls_pem_read_buffer( &pem,
                                            "-----BEGIN NEW CERTIFICATE REQUEST-----",
                                            "-----END NEW CERTIFICATE REQUEST-----",
                                            buf, NULL, 0, &use_len );
         }
+
         if( ret == 0 )
         {
             /*