Bug 1326210 - Noticed in Bug 1265881 Error: TypeError: temp is null Source File: chrome://global/content/bindings/preferences.xml Line: 1227 r=Mossop

toolkit/content/widgets/preferences.xml

@@ -1256,7 +1256,8 @@
           while (temp && temp.nodeType == Node.ELEMENT_NODE &&
                  !temp.hasAttribute("preference"))
             temp = temp.parentNode;
-          return temp.nodeType == Node.ELEMENT_NODE ? temp : aStartElement;
+          return temp && temp.nodeType == Node.ELEMENT_NODE ?
+                 temp : aStartElement;
         ]]>
         </body>
       </method>