--- a/content/xul/document/src/XULDocument.cpp
+++ b/content/xul/document/src/XULDocument.cpp
@@ -3866,18 +3866,20 @@ XULDocument::CreateTemplateBuilder(nsICo
     else {
         // Create and initialize a content builder.
         nsCOMPtr<nsIXULTemplateBuilder> builder
             = do_CreateInstance("@mozilla.org/xul/xul-template-builder;1");
 
         if (! builder)
             return NS_ERROR_FAILURE;
 
-        builder->Init(aElement);
-        builder->CreateContents(aElement, false);
+        nsresult rv = builder->Init(aElement);
+        NS_ENSURE_SUCCESS(rv, rv);
+        rv = builder->CreateContents(aElement, false);
+        NS_ENSURE_SUCCESS(rv, rv);
     }
 
     return NS_OK;
 }
 
 
 nsresult
 XULDocument::AddPrototypeSheets()

--- a/content/xul/templates/src/nsXULTemplateBuilder.cpp
+++ b/content/xul/templates/src/nsXULTemplateBuilder.cpp
@@ -1238,17 +1238,18 @@ nsXULTemplateBuilder::LoadDataSources(ns
     // access it.
     nsCOMPtr<nsIXULDocument> xuldoc = do_QueryInterface(aDocument);
     if (xuldoc)
         xuldoc->SetTemplateBuilderFor(mRoot, this);
 
     if (!mRoot->IsXUL()) {
         // Hmm. This must be an HTML element. Try to set it as a
         // JS property "by hand".
-        InitHTMLTemplateRoot();
+        rv = InitHTMLTemplateRoot();
+        NS_ENSURE_SUCCESS(rv, rv);
     }
   
     return NS_OK;
 }
   
 nsresult
 nsXULTemplateBuilder::LoadDataSourceUrls(nsIDocument* aDocument,
                                          const nsAString& aDataSources,