diff --git a/apps/s_client.c b/apps/s_client.c
index 4410f96603243e371708a945bb5b24becdf3d83a..bc89c984ac46494371225faced484d9f6dfb3fc6 100644
--- a/apps/s_client.c
+++ b/apps/s_client.c
@@ -1742,6 +1742,7 @@ int s_client_main(int argc, char **argv)
         if ((peer_info.addr = BIO_ADDR_new()) == NULL) {
             BIO_printf(bio_err, "memory allocation failure\n");
             BIO_closesocket(s);
+            goto end;
         }
         if (!BIO_sock_info(s, BIO_SOCK_INFO_ADDRESS, &peer_info)) {
             BIO_printf(bio_err, "getsockname:errno=%d\n",