diff --git a/mozilla/content/xul/content/src/nsXULElement.cpp b/mozilla/content/xul/content/src/nsXULElement.cpp
index 65dcfe237e0..1243e1f0f79 100644
--- a/mozilla/content/xul/content/src/nsXULElement.cpp
+++ b/mozilla/content/xul/content/src/nsXULElement.cpp
@@ -3673,8 +3673,9 @@ nsXULPrototypeScript::Compile(const PRUnichar* aText, PRInt32 aTextLength,
 
     nsCOMPtr<nsIScriptGlobalObject> global;
     aDocument->GetScriptGlobalObject(getter_AddRefs(global));
-
-    NS_ENSURE_TRUE(global, NS_ERROR_UNEXPECTED);
+    NS_ASSERTION(global != nsnull, "no script global object");
+    if (! global)
+        return NS_ERROR_UNEXPECTED;
 
     nsCOMPtr<nsIScriptContext> context;
     rv = global->GetContext(getter_AddRefs(context));
diff --git a/mozilla/content/xul/templates/src/nsXULTemplateBuilder.cpp b/mozilla/content/xul/templates/src/nsXULTemplateBuilder.cpp
index fe50b7ed694..5ebfa19e3cf 100644
--- a/mozilla/content/xul/templates/src/nsXULTemplateBuilder.cpp
+++ b/mozilla/content/xul/templates/src/nsXULTemplateBuilder.cpp
@@ -2958,11 +2958,13 @@ RDFGenericBuilderImpl::AddDatabasePropertyToHTMLElement(nsIContent* aElement, ns
 
     nsCOMPtr<nsIScriptGlobalObject> global;
     doc->GetScriptGlobalObject(getter_AddRefs(global));
-    NS_ENSURE_TRUE(global, NS_ERROR_UNEXPECTED);
+    if (! global)
+        return NS_ERROR_UNEXPECTED;
 
     nsCOMPtr<nsIScriptContext> context;
     global->GetContext(getter_AddRefs(context));
-    NS_ENSURE_TRUE(context, NS_ERROR_UNEXPECTED);
+    if (! context)
+        return NS_ERROR_UNEXPECTED;
 
     JSContext* jscontext = NS_STATIC_CAST(JSContext*, context->GetNativeContext());
     NS_ASSERTION(context != nsnull, "no jscontext");
diff --git a/mozilla/rdf/content/src/nsRDFGenericBuilder.cpp b/mozilla/rdf/content/src/nsRDFGenericBuilder.cpp
index fe50b7ed694..5ebfa19e3cf 100644
--- a/mozilla/rdf/content/src/nsRDFGenericBuilder.cpp
+++ b/mozilla/rdf/content/src/nsRDFGenericBuilder.cpp
@@ -2958,11 +2958,13 @@ RDFGenericBuilderImpl::AddDatabasePropertyToHTMLElement(nsIContent* aElement, ns
 
     nsCOMPtr<nsIScriptGlobalObject> global;
     doc->GetScriptGlobalObject(getter_AddRefs(global));
-    NS_ENSURE_TRUE(global, NS_ERROR_UNEXPECTED);
+    if (! global)
+        return NS_ERROR_UNEXPECTED;
 
     nsCOMPtr<nsIScriptContext> context;
     global->GetContext(getter_AddRefs(context));
-    NS_ENSURE_TRUE(context, NS_ERROR_UNEXPECTED);
+    if (! context)
+        return NS_ERROR_UNEXPECTED;
 
     JSContext* jscontext = NS_STATIC_CAST(JSContext*, context->GetNativeContext());
     NS_ASSERTION(context != nsnull, "no jscontext");
diff --git a/mozilla/rdf/content/src/nsXULElement.cpp b/mozilla/rdf/content/src/nsXULElement.cpp
index 65dcfe237e0..1243e1f0f79 100644
--- a/mozilla/rdf/content/src/nsXULElement.cpp
+++ b/mozilla/rdf/content/src/nsXULElement.cpp
@@ -3673,8 +3673,9 @@ nsXULPrototypeScript::Compile(const PRUnichar* aText, PRInt32 aTextLength,
 
     nsCOMPtr<nsIScriptGlobalObject> global;
     aDocument->GetScriptGlobalObject(getter_AddRefs(global));
-
-    NS_ENSURE_TRUE(global, NS_ERROR_UNEXPECTED);
+    NS_ASSERTION(global != nsnull, "no script global object");
+    if (! global)
+        return NS_ERROR_UNEXPECTED;
 
     nsCOMPtr<nsIScriptContext> context;
     rv = global->GetContext(getter_AddRefs(context));
diff --git a/mozilla/rdf/content/src/nsXULTemplateBuilder.cpp b/mozilla/rdf/content/src/nsXULTemplateBuilder.cpp
index fe50b7ed694..5ebfa19e3cf 100644
--- a/mozilla/rdf/content/src/nsXULTemplateBuilder.cpp
+++ b/mozilla/rdf/content/src/nsXULTemplateBuilder.cpp
@@ -2958,11 +2958,13 @@ RDFGenericBuilderImpl::AddDatabasePropertyToHTMLElement(nsIContent* aElement, ns
 
     nsCOMPtr<nsIScriptGlobalObject> global;
     doc->GetScriptGlobalObject(getter_AddRefs(global));
-    NS_ENSURE_TRUE(global, NS_ERROR_UNEXPECTED);
+    if (! global)
+        return NS_ERROR_UNEXPECTED;
 
     nsCOMPtr<nsIScriptContext> context;
     global->GetContext(getter_AddRefs(context));
-    NS_ENSURE_TRUE(context, NS_ERROR_UNEXPECTED);
+    if (! context)
+        return NS_ERROR_UNEXPECTED;
 
     JSContext* jscontext = NS_STATIC_CAST(JSContext*, context->GetNativeContext());
     NS_ASSERTION(context != nsnull, "no jscontext");