diff --git a/mozilla/security/nss/cmd/certutil/certutil.c b/mozilla/security/nss/cmd/certutil/certutil.c
index b81ba9dc50e..4f9686da41c 100644
--- a/mozilla/security/nss/cmd/certutil/certutil.c
+++ b/mozilla/security/nss/cmd/certutil/certutil.c
@@ -2887,8 +2887,6 @@ shutdown:
     if ((initialized == PR_TRUE) && NSS_Shutdown() != SECSuccess) {
         exit(1);
     }
-    PR_Cleanup();
-
     if (rv == SECSuccess) {
 	return 0;
     } else {
@@ -2899,5 +2897,8 @@ shutdown:
 int
 main(int argc, char **argv)
 {
-    return certutil_main(argc, argv, PR_TRUE);
+    int rv = certutil_main(argc, argv, PR_TRUE);
+    PR_Cleanup();
+    return rv;
 }
+