diff --git a/library/pkcs7.c b/library/pkcs7.c
index fc6dd33..e4238b6 100644
--- a/library/pkcs7.c
+++ b/library/pkcs7.c
@@ -387,7 +387,7 @@
 
     ret = pkcs7_get_signer_info( p, end_set, signers_set );
     if( ret != 0 )
-        return( ret );
+        goto cleanup;
     count++;
 
     mbedtls_pkcs7_signer_info *prev = signers_set;