diff --git a/library/x509.c b/library/x509.c
index 403507413d..812eba8afd 100644
--- a/library/x509.c
+++ b/library/x509.c
@@ -538,14 +538,9 @@ int mbedtls_x509_get_name( unsigned char **p, const unsigned char *end,
     }
 
 error:
-    prev = NULL;
-
     /* Skip the first element as we did not allocate it */
     allocated = head->next;
 
-    /* Make sure we cannot be followed along this list */
-    head->next = NULL;
-
     while( allocated != NULL )
     {
         prev = allocated;