diff --git a/mozilla/security/nss/cmd/SSLsample/sslsample.c b/mozilla/security/nss/cmd/SSLsample/sslsample.c
index 47b7d0d4f7c..5a25b940da5 100644
--- a/mozilla/security/nss/cmd/SSLsample/sslsample.c
+++ b/mozilla/security/nss/cmd/SSLsample/sslsample.c
@@ -363,7 +363,8 @@ exitErr(char *function)
 {
 	errWarn(function);
 	/* Exit gracefully. */
-	NSS_Shutdown();
+	/* ignoring return value of NSS_Shutdown as code exits with 1*/
+	(void) NSS_Shutdown();
 	PR_Cleanup();
 	exit(1);
 }
diff --git a/mozilla/security/nss/cmd/ocspclnt/ocspclnt.c b/mozilla/security/nss/cmd/ocspclnt/ocspclnt.c
index b3c0f92789c..9d17937056f 100644
--- a/mozilla/security/nss/cmd/ocspclnt/ocspclnt.c
+++ b/mozilla/security/nss/cmd/ocspclnt/ocspclnt.c
@@ -34,7 +34,7 @@
 /*
  * Test program for client-side OCSP.
  *
- * $Id: ocspclnt.c,v 1.4 2002-07-03 20:22:27 javi%netscape.com Exp $
+ * $Id: ocspclnt.c,v 1.5 2003-04-01 18:55:16 bishakhabanerjee%netscape.com Exp $
  */
 
 #include "secutil.h"
@@ -1211,7 +1211,9 @@ nssdone:
 	(void) CERT_DisableOCSPChecking (handle);
     }
 
-    NSS_Shutdown ();
+    if (NSS_Shutdown () != SECSuccess) {
+	exit(1);
+    }
 
 prdone:
     PR_Cleanup ();
diff --git a/mozilla/security/nss/cmd/sdrtest/sdrtest.c b/mozilla/security/nss/cmd/sdrtest/sdrtest.c
index 787439e29ba..b20f50d368c 100644
--- a/mozilla/security/nss/cmd/sdrtest/sdrtest.c
+++ b/mozilla/security/nss/cmd/sdrtest/sdrtest.c
@@ -34,7 +34,7 @@
 /*
  * Test program for SDR (Secret Decoder Ring) functions.
  *
- * $Id: sdrtest.c,v 1.8 2002-09-06 00:27:21 wtc%netscape.com Exp $
+ * $Id: sdrtest.c,v 1.9 2003-04-01 18:58:32 bishakhabanerjee%netscape.com Exp $
  */
 
 #include "nspr.h"
@@ -295,7 +295,9 @@ file_loser:
 loser:
     if (text.data) free(text.data);
     if (result.data) free(result.data);
-    NSS_Shutdown();
+    if (NSS_Shutdown() != SECSuccess)
+       exit(1);
+    }
 
 prdone:
     PR_Cleanup ();
diff --git a/mozilla/security/nss/cmd/vfyserv/vfyutil.c b/mozilla/security/nss/cmd/vfyserv/vfyutil.c
index 6e0f59d0488..10e39345853 100644
--- a/mozilla/security/nss/cmd/vfyserv/vfyutil.c
+++ b/mozilla/security/nss/cmd/vfyserv/vfyutil.c
@@ -381,7 +381,8 @@ exitErr(char *function)
 {
     errWarn(function);
     /* Exit gracefully. */
-    NSS_Shutdown();
+    /* ignoring return value of NSS_Shutdown as code exits with 1 anyway*/
+    (void) NSS_Shutdown();
     PR_Cleanup();
     exit(1);
 }