diff --git a/src/ssl.c b/src/ssl.c
index ec90a6433..693fc7c08 100644
--- a/src/ssl.c
+++ b/src/ssl.c
@@ -23004,7 +23004,8 @@ unsigned long wolfSSL_ERR_peek_error_line_data(const char **file, int *line,
             if (ret == SSL_NO_PEM_HEADER)
                 return (ERR_LIB_PEM << 24) | PEM_R_NO_START_LINE;
             if (ret != WANT_READ && ret != WANT_WRITE &&
-                    ret != ZERO_RETURN && ret != SSL_ERROR_ZERO_RETURN)
+                    ret != ZERO_RETURN && ret != SSL_ERROR_ZERO_RETURN &&
+                    ret != SOCKET_PEER_CLOSED_E && ret != SOCKET_ERROR_E)
                 break;
 
             wc_RemoveErrorNode(-1);
diff --git a/wolfssl/internal.h b/wolfssl/internal.h
index 2fb249f56..e86cdb3a5 100644
--- a/wolfssl/internal.h
+++ b/wolfssl/internal.h
@@ -1059,7 +1059,7 @@ enum Misc {
     MAX_WOLFSSL_FILE_SIZE = 1024 * 1024 * 4,  /* 4 mb file size alloc limit */
 
 #if defined(HAVE_EX_DATA) || defined(FORTRESS)
-    MAX_EX_DATA        =   4,  /* allow for four items of ex_data */
+    MAX_EX_DATA        =   5,  /* allow for five items of ex_data */
 #endif
 
     MAX_X509_SIZE      = 2048, /* max static x509 buffer size */