diff --git a/library/x509_create.c b/library/x509_create.c
index 8630096..ab5f85b 100644
--- a/library/x509_create.c
+++ b/library/x509_create.c
@@ -85,6 +85,9 @@
             strncmp( cur->name, name, name_len ) == 0 )
             break;
 
+    if ( cur->name == NULL )
+        return( NULL );
+        
     return( cur );
 }