diff --git a/src/internal.c b/src/internal.c
index 9179aada8..35099a6a1 100644
--- a/src/internal.c
+++ b/src/internal.c
@@ -4336,6 +4336,7 @@ void SetErrorString(int error, char* str)
         break;
 
     case WANT_READ :
+    case SSL_ERROR_WANT_READ :
         XSTRNCPY(str, "non-blocking socket wants data to be read", max);
         break;
 
@@ -4352,6 +4353,7 @@ void SetErrorString(int error, char* str)
         break;
 
     case WANT_WRITE :
+    case SSL_ERROR_WANT_WRITE :
         XSTRNCPY(str, "non-blocking socket write buffer full", max);
         break;
 
@@ -4432,6 +4434,7 @@ void SetErrorString(int error, char* str)
         break;
 
     case ZERO_RETURN:
+    case SSL_ERROR_ZERO_RETURN:
         XSTRNCPY(str, "peer sent close notify alert", max);
         break;
 
diff --git a/src/ssl.c b/src/ssl.c
index 9b0986977..6efcef0b0 100644
--- a/src/ssl.c
+++ b/src/ssl.c
@@ -486,6 +486,7 @@ int CyaSSL_get_error(CYASSL* ssl, int ret)
     if (ret > 0)
         return SSL_ERROR_NONE;
 
+    /* make sure converted types are handled in SetErrorString() too */
     if (ssl->error == WANT_READ)
         return SSL_ERROR_WANT_READ;         /* convert to OpenSSL type */
     else if (ssl->error == WANT_WRITE)