diff --git a/mozilla/extensions/wallet/src/nsPasswordManager.cpp b/mozilla/extensions/wallet/src/nsPasswordManager.cpp
index 933e09db0df..a3b4826fb01 100644
--- a/mozilla/extensions/wallet/src/nsPasswordManager.cpp
+++ b/mozilla/extensions/wallet/src/nsPasswordManager.cpp
@@ -225,8 +225,10 @@ nsPasswordManager::FindPasswordEntry
   // Emumerate through set of saved logins
   while (hasMoreElements) {
     rv = enumerator->GetNext(getter_AddRefs(passwordElem));
+    if (NS_FAILED(rv))
+      return rv;
 
-    if (NS_SUCCEEDED(rv) && passwordElem) {
+    if (passwordElem) {
 
       // Get the contents of this saved login
       nsCAutoString hostURI;