diff --git a/mozilla/content/xul/templates/src/nsXULTemplateBuilder.cpp b/mozilla/content/xul/templates/src/nsXULTemplateBuilder.cpp
index f1fb2dd1400..65490b5d12f 100644
--- a/mozilla/content/xul/templates/src/nsXULTemplateBuilder.cpp
+++ b/mozilla/content/xul/templates/src/nsXULTemplateBuilder.cpp
@@ -1385,6 +1385,8 @@ RDFGenericBuilderImpl::UpdateWidgetItemAttribute(nsIContent* aTemplateNode,
 		nsCOMPtr<nsIContent>	aTreeItemKid;
 		if (NS_FAILED(rv = aTreeItemElement->ChildAt(loop, *getter_AddRefs(aTreeItemKid))))
 			continue;
+		if (!aTreeItemKid)
+			continue;
 		rv = UpdateWidgetItemAttribute(aTemplateKid, aTreeItemKid, aAction, aProperty, aValue);
 	}
 	return(rv);
diff --git a/mozilla/rdf/content/src/nsRDFGenericBuilder.cpp b/mozilla/rdf/content/src/nsRDFGenericBuilder.cpp
index f1fb2dd1400..65490b5d12f 100644
--- a/mozilla/rdf/content/src/nsRDFGenericBuilder.cpp
+++ b/mozilla/rdf/content/src/nsRDFGenericBuilder.cpp
@@ -1385,6 +1385,8 @@ RDFGenericBuilderImpl::UpdateWidgetItemAttribute(nsIContent* aTemplateNode,
 		nsCOMPtr<nsIContent>	aTreeItemKid;
 		if (NS_FAILED(rv = aTreeItemElement->ChildAt(loop, *getter_AddRefs(aTreeItemKid))))
 			continue;
+		if (!aTreeItemKid)
+			continue;
 		rv = UpdateWidgetItemAttribute(aTemplateKid, aTreeItemKid, aAction, aProperty, aValue);
 	}
 	return(rv);
diff --git a/mozilla/rdf/content/src/nsXULTemplateBuilder.cpp b/mozilla/rdf/content/src/nsXULTemplateBuilder.cpp
index f1fb2dd1400..65490b5d12f 100644
--- a/mozilla/rdf/content/src/nsXULTemplateBuilder.cpp
+++ b/mozilla/rdf/content/src/nsXULTemplateBuilder.cpp
@@ -1385,6 +1385,8 @@ RDFGenericBuilderImpl::UpdateWidgetItemAttribute(nsIContent* aTemplateNode,
 		nsCOMPtr<nsIContent>	aTreeItemKid;
 		if (NS_FAILED(rv = aTreeItemElement->ChildAt(loop, *getter_AddRefs(aTreeItemKid))))
 			continue;
+		if (!aTreeItemKid)
+			continue;
 		rv = UpdateWidgetItemAttribute(aTemplateKid, aTreeItemKid, aAction, aProperty, aValue);
 	}
 	return(rv);