diff --git a/CryptoPkg/Library/TlsLib/TlsProcess.c b/CryptoPkg/Library/TlsLib/TlsProcess.c
index 1b712cd452..17aeff1c37 100644
--- a/CryptoPkg/Library/TlsLib/TlsProcess.c
+++ b/CryptoPkg/Library/TlsLib/TlsProcess.c
@@ -133,19 +133,23 @@ TlsDoHandshake (
       DEBUG_CODE_BEGIN ();
       while (TRUE) {
         unsigned long  ErrorCode;
+        const char     *Func;
+        const char     *Data;
 
-        ErrorCode = ERR_get_error ();
+        ErrorCode = ERR_get_error_all (NULL, NULL, &Func, &Data, NULL);
         if (ErrorCode == 0) {
           break;
         }
 
         DEBUG ((
           DEBUG_ERROR,
-          "%a ERROR 0x%x=L%x:R%x\n",
+          "%a ERROR 0x%x=L%x:R%x %a(): %a\n",
           __func__,
           ErrorCode,
           ERR_GET_LIB (ErrorCode),
-          ERR_GET_REASON (ErrorCode)
+          ERR_GET_REASON (ErrorCode),
+          Func,
+          Data
           ));
       }