diff --git a/library/ssl_client.c b/library/ssl_client.c
index ee5a78a49c..e7453d5730 100644
--- a/library/ssl_client.c
+++ b/library/ssl_client.c
@@ -650,7 +650,7 @@ static int ssl_write_client_hello_body( mbedtls_ssl_context *ssl,
      */
     if( propose_tls13 && mbedtls_ssl_conf_tls13_some_psk_enabled( ssl ) )
     {
-        ret = mbedtls_ssl_tls13_write_pre_shared_key_ext_without_binders(
+        ret = mbedtls_ssl_tls13_write_identities_of_pre_shared_key_ext(
                   ssl, p, end, &output_len, binders_len );
         if( ret != 0 )
             return( ret );
diff --git a/library/ssl_misc.h b/library/ssl_misc.h
index 295ff9f239..ca57114220 100644
--- a/library/ssl_misc.h
+++ b/library/ssl_misc.h
@@ -2448,7 +2448,7 @@ int mbedtls_ssl_get_psk_to_offer(
  *                          the extension.
  */
 MBEDTLS_CHECK_RETURN_CRITICAL
-int mbedtls_ssl_tls13_write_pre_shared_key_ext_without_binders(
+int mbedtls_ssl_tls13_write_identities_of_pre_shared_key_ext(
     mbedtls_ssl_context *ssl,
     unsigned char *buf, unsigned char *end,
     size_t *out_len, size_t *binders_len );
diff --git a/library/ssl_tls13_client.c b/library/ssl_tls13_client.c
index 5c693bdb0e..b23b0c54e9 100644
--- a/library/ssl_tls13_client.c
+++ b/library/ssl_tls13_client.c
@@ -692,7 +692,7 @@ static int ssl_tls13_write_psk_key_exchange_modes_ext( mbedtls_ssl_context *ssl,
 
 #if defined(MBEDTLS_KEY_EXCHANGE_SOME_PSK_ENABLED)
 
-int mbedtls_ssl_tls13_write_pre_shared_key_ext_without_binders(
+int mbedtls_ssl_tls13_write_identities_of_pre_shared_key_ext(
     mbedtls_ssl_context *ssl,
     unsigned char *buf, unsigned char *end,
     size_t *out_len, size_t *binders_len )
diff --git a/library/ssl_tls13_generic.c b/library/ssl_tls13_generic.c
index 9fd246df61..1e63c776ea 100644
--- a/library/ssl_tls13_generic.c
+++ b/library/ssl_tls13_generic.c
@@ -1509,7 +1509,6 @@ int mbedtls_ssl_tls13_generate_and_write_ecdh_key_exchange(
 /* Check if we have any PSK to offer, returns 0 if PSK is available.
  * Assign the psk and ticket if pointers are present.
  */
-MBEDTLS_CHECK_RETURN_CRITICAL
 int mbedtls_ssl_get_psk_to_offer(
         const mbedtls_ssl_context *ssl,
         int *psk_type,
diff --git a/tests/ssl-opt.sh b/tests/ssl-opt.sh
index a0ddd81f22..1b94773a63 100755
--- a/tests/ssl-opt.sh
+++ b/tests/ssl-opt.sh
@@ -12027,6 +12027,8 @@ run_test    "TLS 1.3, default suite, PSK - gnutls" \
             -c "client hello, adding pre_shared_key extension, omitting PSK binder list" \
             -c "client hello, adding psk_key_exchange_modes extension" \
             -c "client hello, adding PSK binder list" \
+            -s "Parsing extension 'PSK Key Exchange Modes/45'" \
+            -s "Parsing extension 'Pre Shared Key/41'" \
             -c "<= write client hello"
 
 for i in opt-testcases/*.sh