diff --git a/mozilla/security/nss/lib/ssl/sslerr.c b/mozilla/security/nss/lib/ssl/sslerr.c
index e8f11e06e70..57b3582a4cb 100644
--- a/mozilla/security/nss/lib/ssl/sslerr.c
+++ b/mozilla/security/nss/lib/ssl/sslerr.c
@@ -33,7 +33,7 @@
  * may use your version of this file under either the MPL or the
  * GPL.
  *
- * $Id: sslerr.c,v 1.1 2000-03-31 19:34:59 relyea%netscape.com Exp $
+ * $Id: sslerr.c,v 1.2 2000-09-07 03:35:31 nelsonb%netscape.com Exp $
  */
 
 #include "prerror.h"
@@ -58,8 +58,10 @@ ssl_MapLowLevelError(int hiLevelError)
     case SEC_ERROR_IO:
     case SEC_ERROR_BAD_DATA:
     case SEC_ERROR_LIBRARY_FAILURE:
+    case SEC_ERROR_EXTENSION_NOT_FOUND:
     case SSL_ERROR_BAD_CLIENT:
     case SSL_ERROR_BAD_SERVER:
+    case SSL_ERROR_SESSION_NOT_FOUND:
     	PORT_SetError(hiLevelError);
 	return hiLevelError;
 
diff --git a/mozilla/security/nss/lib/ssl/sslsnce.c b/mozilla/security/nss/lib/ssl/sslsnce.c
index 1030c582d22..587003bd0e1 100644
--- a/mozilla/security/nss/lib/ssl/sslsnce.c
+++ b/mozilla/security/nss/lib/ssl/sslsnce.c
@@ -32,7 +32,7 @@
  * may use your version of this file under either the MPL or the
  * GPL.
  *
- * $Id: sslsnce.c,v 1.2 2000-05-16 17:28:31 relyea%netscape.com Exp $
+ * $Id: sslsnce.c,v 1.3 2000-09-07 03:35:31 nelsonb%netscape.com Exp $
  */
 
 /* Note: ssl_FreeSID() in sslnonce.c gets used for both client and server 
@@ -1214,10 +1214,15 @@ static void
 ServerSessionIDUncache(sslSessionID *sid)
 {
     SIDCacheEntry sce;
+    PRErrorCode   err;
     int rv;
 
     if (sid == NULL) return;
     
+    /* Uncaching a SID should never change the error code. 
+    ** So save it here and restore it before exiting.
+    */
+    err = PR_GetError();
     lock_cache();
     if (sid->version < SSL_LIBRARY_VERSION_3_0) {
 	SSL_TRC(8, ("%d: SSL: UncacheMT: valid=%d addr=0x%08x time=%x "
@@ -1246,6 +1251,7 @@ ServerSessionIDUncache(sslSessionID *sid)
     }
     sid->cached = invalid_cache;
     unlock_cache();
+    PORT_SetError(err);
 }
 
 static SECStatus