From 61c233d099ecefa57fca9338d73cddffa59093a4 Mon Sep 17 00:00:00 2001
From: byron jones <glob@mozilla.com>
Date: Wed, 7 Oct 2015 11:16:07 +0530
Subject: [PATCH] Bug 1211780 - Don't try to use oldPasswordField if it's null.
 r=dolske

---
 toolkit/components/passwordmgr/LoginManagerContent.jsm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/toolkit/components/passwordmgr/LoginManagerContent.jsm b/toolkit/components/passwordmgr/LoginManagerContent.jsm
index 9a08b8be19f8..d30354b3b6c0 100644
--- a/toolkit/components/passwordmgr/LoginManagerContent.jsm
+++ b/toolkit/components/passwordmgr/LoginManagerContent.jsm
@@ -714,7 +714,8 @@ var LoginManagerContent = {
     }
 
     log("Password field (new) id/name is: ", newPasswordField.id, " / ", newPasswordField.name);
-    log("Password field (old) id/name is: ", oldPasswordField.id, " / ", oldPasswordField.name);
+    if (oldPasswordField)
+      log("Password field (old) id/name is: ", oldPasswordField.id, " / ", oldPasswordField.name);
     return [usernameField, newPasswordField, oldPasswordField];
   },