diff --git a/library/ssl_cli.c b/library/ssl_cli.c
index c3c28c7..0a1fce8 100644
--- a/library/ssl_cli.c
+++ b/library/ssl_cli.c
@@ -2328,9 +2328,8 @@
                                            &peer_pk );
         if( ret != 0 )
         {
-            /* Should never happen */
-            MBEDTLS_SSL_DEBUG_MSG( 1, ( "should never happen" ) );
-            return( MBEDTLS_ERR_SSL_INTERNAL_ERROR );
+            MBEDTLS_SSL_DEBUG_RET( 1, "mbedtls_x509_crt_pk_acquire", ret );
+            return( ret );
         }
     }
 #endif /* MBEDTLS_SSL_KEEP_PEER_CERTIFICATE */
@@ -2472,9 +2471,8 @@
                                        &peer_pk );
     if( ret != 0 )
     {
-        /* Should never happen */
-        MBEDTLS_SSL_DEBUG_MSG( 1, ( "should never happen" ) );
-        return( MBEDTLS_ERR_SSL_INTERNAL_ERROR );
+        MBEDTLS_SSL_DEBUG_RET( 1, "mbedtls_x509_crt_pk_acquire", ret );
+        return( ret );
     }
 #endif /* MBEDTLS_SSL_KEEP_PEER_CERTIFICATE */
 
@@ -2822,9 +2820,8 @@
                                            &peer_pk );
         if( ret != 0 )
         {
-            /* Should never happen */
-            MBEDTLS_SSL_DEBUG_MSG( 1, ( "should never happen" ) );
-            return( MBEDTLS_ERR_SSL_INTERNAL_ERROR );
+            MBEDTLS_SSL_DEBUG_RET( 1, "mbedtls_x509_crt_pk_acquire", ret );
+            return( ret );
         }
 #endif /* MBEDTLS_SSL_KEEP_PEER_CERTIFICATE */