diff --git a/extra/yassl/src/yassl_error.cpp b/extra/yassl/src/yassl_error.cpp
index 5169b7d..aa477a9 100644
--- a/extra/yassl/src/yassl_error.cpp
+++ b/extra/yassl/src/yassl_error.cpp
@@ -22,6 +22,7 @@
 
 #include "runtime.hpp"
 #include "yassl_error.hpp"
+#include "yassl_int.hpp"
 #include "error.hpp"        // TaoCrypt error numbers
 #include "openssl/ssl.h"    // SSL_ERROR_WANT_READ
 #include <string.h>         // strncpy
@@ -152,6 +153,53 @@ void SetErrorString(YasslError error, char* buffer)
         strncpy(buffer, "rsa signature fault error", max);
         break;
 
+    // SSL/TLS Alerts
+    // case close_notify: -- Not an error;
+
+    case unexpected_message:
+        strncpy(buffer, "TLS: Received unexpected_message alert from peer (fatal)", max);
+        break;
+
+    case bad_record_mac:
+        strncpy(buffer, "TLS: Received bad_record_mac alert from peer (fatal)", max);
+        break;
+
+    case decompression_failure:
+        strncpy(buffer, "TLS: Received decompression_failure alert from peer (fatal)", max);
+        break;
+
+    case handshake_failure:
+        strncpy(buffer, "TLS: Received handshake_failure alert from peer (fatal)", max);
+        break;
+
+    case no_certificate:
+        strncpy(buffer, "TLS: Received no_certificate alert from peer (fatal)", max);
+        break;
+
+    case bad_certificate:
+        strncpy(buffer, "TLS: Received bad_certificate alert from peer", max);
+        break;
+
+    case unsupported_certificate:
+        strncpy(buffer, "TLS: Received unsupported_certificate alert from peer", max);
+        break;
+
+    case certificate_revoked:
+        strncpy(buffer, "TLS: Received certificate_revoked alert from peer", max);
+        break;
+
+    case certificate_expired:
+        strncpy(buffer, "TLS: Received certificate_expired alert from peer", max);
+        break;
+
+    case certificate_unknown:
+        strncpy(buffer, "TLS: Received certificate_unknown alert from peer", max);
+        break;
+
+    case illegal_parameter:
+        strncpy(buffer, "TLS: Received illegal_parameter alert from peer (fatal)", max);
+        break;
+
         // openssl errors
     case SSL_ERROR_WANT_READ :
         strncpy(buffer, "the read operation would block", max);