diff --git a/mozilla/security/manager/ssl/src/nsCertOutliner.cpp b/mozilla/security/manager/ssl/src/nsCertOutliner.cpp
index 651eef235af..11d2f56269a 100644
--- a/mozilla/security/manager/ssl/src/nsCertOutliner.cpp
+++ b/mozilla/security/manager/ssl/src/nsCertOutliner.cpp
@@ -231,7 +231,7 @@ nsCertOutliner::GetCertAtIndex(PRInt32 index)
                              dont_AddRef(mCertArray->ElementAt(certIndex));
       nsCOMPtr<nsIX509Cert> cert = do_QueryInterface(isupport);
       rawPtr = cert;
-      NS_ADDREF(rawPtr);
+      NS_IF_ADDREF(rawPtr);
       break;
     }
     if (mOutlinerArray[i].open)
diff --git a/mozilla/security/manager/ssl/src/nsCertTree.cpp b/mozilla/security/manager/ssl/src/nsCertTree.cpp
index 651eef235af..11d2f56269a 100644
--- a/mozilla/security/manager/ssl/src/nsCertTree.cpp
+++ b/mozilla/security/manager/ssl/src/nsCertTree.cpp
@@ -231,7 +231,7 @@ nsCertOutliner::GetCertAtIndex(PRInt32 index)
                              dont_AddRef(mCertArray->ElementAt(certIndex));
       nsCOMPtr<nsIX509Cert> cert = do_QueryInterface(isupport);
       rawPtr = cert;
-      NS_ADDREF(rawPtr);
+      NS_IF_ADDREF(rawPtr);
       break;
     }
     if (mOutlinerArray[i].open)
diff --git a/mozilla/security/manager/ssl/src/nsNSSComponent.cpp b/mozilla/security/manager/ssl/src/nsNSSComponent.cpp
index 6fb41422e5d..7af381afbd3 100644
--- a/mozilla/security/manager/ssl/src/nsNSSComponent.cpp
+++ b/mozilla/security/manager/ssl/src/nsNSSComponent.cpp
@@ -149,22 +149,20 @@ nsNSSComponent::GetPIPNSSBundleString(const PRUnichar *name,
                                       nsString &outString)
 {
   PRUnichar *ptrv = nsnull;
+  nsresult rv = NS_ERROR_FAILURE;
+
+  outString.SetLength(0);
   if (mPIPNSSBundle && name) {
-    nsresult rv = mPIPNSSBundle->GetStringFromName(name, &ptrv);
+    rv = mPIPNSSBundle->GetStringFromName(name, &ptrv);
     if (NS_SUCCEEDED(rv)) {
       outString = ptrv;
-      return NS_OK;
-    } else {
-      outString.SetLength(0);
+      rv = NS_OK;
     }
-    nsMemory::Free(ptrv);
-  } else {
-    outString.SetLength(0);
   }
   if (ptrv)
     nsMemory::Free(ptrv);
 
-  return NS_ERROR_FAILURE;
+  return rv;
 }
 
 void