diff --git a/programs/x509/cert_app.c b/programs/x509/cert_app.c
index 08d1b9a..18c23b2 100644
--- a/programs/x509/cert_app.c
+++ b/programs/x509/cert_app.c
@@ -312,7 +312,8 @@
          * 5. Print the certificate
          */
         printf( "  . Peer certificate information    ...\n" );
-        ret = x509parse_cert_info( (char *) buf, sizeof( buf ) - 1, "      ", ssl.peer_cert );
+        ret = x509parse_cert_info( (char *) buf, sizeof( buf ) - 1, "      ",
+                                   ssl.session->peer_cert );
         if( ret == -1 )
         {
             printf( " failed\n  !  x509parse_cert_info returned %d\n\n", ret );
@@ -332,10 +333,9 @@
         net_close( server_fd );
     x509_free( &clicert );
     rsa_free( &rsa );
+    ssl_session_free( &ssn );
     ssl_free( &ssl );
 
-    memset( &ssl, 0, sizeof( ssl ) );
-
 #if defined(_WIN32)
     printf( "  + Press Enter to exit this program.\n" );
     fflush( stdout ); getchar();