diff --git a/mozilla/content/html/document/src/nsHTMLDocument.cpp b/mozilla/content/html/document/src/nsHTMLDocument.cpp
index 86c6ae1770d..0eab1ed872f 100644
--- a/mozilla/content/html/document/src/nsHTMLDocument.cpp
+++ b/mozilla/content/html/document/src/nsHTMLDocument.cpp
@@ -2958,7 +2958,8 @@ nsresult
 nsHTMLDocument::UpdateNameTableEntry(const nsAString& aName,
                                      nsIContent *aContent)
 {
-  NS_ASSERTION(!IsXHTML(), "Don't call me on an XHTML document!!!");
+  NS_ASSERTION(!IsXHTML(), 
+  "nsHTMLDocument::UpdateNameTableEntry Don't call me on an XHTML document!!!");
 
   IdAndNameMapEntry *entry =
     NS_STATIC_CAST(IdAndNameMapEntry *,
@@ -3023,7 +3024,8 @@ nsresult
 nsHTMLDocument::RemoveFromNameTable(const nsAString& aName,
                                     nsIContent *aContent)
 {
-  NS_ASSERTION(!IsXHTML(), "Don't call me on an XHTML document!!!");
+  NS_ASSERTION(!IsXHTML(), 
+  "nsHTMLDocument::RemoveFromNameTable Don't call me on an XHTML document!!!");
 
   IdAndNameMapEntry *entry =
     NS_STATIC_CAST(IdAndNameMapEntry *,
diff --git a/mozilla/dom/src/base/nsDOMClassInfo.cpp b/mozilla/dom/src/base/nsDOMClassInfo.cpp
index ddf54ed77bd..1b73d650cb7 100644
--- a/mozilla/dom/src/base/nsDOMClassInfo.cpp
+++ b/mozilla/dom/src/base/nsDOMClassInfo.cpp
@@ -2970,7 +2970,7 @@ NS_IMETHODIMP
 nsDOMClassInfo::PreCreate(nsISupports *nativeObj, JSContext *cx,
                           JSObject *globalObj, JSObject **parentObj)
 {
-  NS_ERROR("Don't call me!");
+  NS_ERROR("nsDOMClassInfo::PreCreate Don't call me!");
 
   return NS_ERROR_UNEXPECTED;
 }
@@ -2979,7 +2979,7 @@ NS_IMETHODIMP
 nsDOMClassInfo::Create(nsIXPConnectWrappedNative *wrapper,
                        JSContext *cx, JSObject *obj)
 {
-  NS_ERROR("Don't call me!");
+  NS_ERROR("nsDOMClassInfo::Create Don't call me!");
 
   return NS_ERROR_UNEXPECTED;
 }
@@ -3057,7 +3057,7 @@ nsDOMClassInfo::AddProperty(nsIXPConnectWrappedNative *wrapper, JSContext *cx,
                             JSObject *obj, jsval id, jsval *vp,
                             PRBool *_retval)
 {
-  NS_ERROR("Don't call me!");
+  NS_ERROR("nsDOMClassInfo::AddProperty Don't call me!");
 
   return NS_ERROR_UNEXPECTED;
 }
@@ -3067,7 +3067,7 @@ nsDOMClassInfo::DelProperty(nsIXPConnectWrappedNative *wrapper, JSContext *cx,
                             JSObject *obj, jsval id, jsval *vp,
                             PRBool *_retval)
 {
-  NS_ERROR("Don't call me!");
+  NS_ERROR("nsDOMClassInfo::DelProperty Don't call me!");
 
   return NS_ERROR_UNEXPECTED;
 }
@@ -3077,7 +3077,7 @@ nsDOMClassInfo::GetProperty(nsIXPConnectWrappedNative *wrapper, JSContext *cx,
                             JSObject *obj, jsval id, jsval *vp,
                             PRBool *_retval)
 {
-  NS_ERROR("Don't call me!");
+  NS_ERROR("nsDOMClassInfo::GetProperty Don't call me!");
 
   return NS_OK;
 }
@@ -3087,7 +3087,7 @@ nsDOMClassInfo::SetProperty(nsIXPConnectWrappedNative *wrapper, JSContext *cx,
                             JSObject *obj, jsval id, jsval *vp,
                             PRBool *_retval)
 {
-  NS_ERROR("Don't call me!");
+  NS_ERROR("nsDOMClassInfo::SetProperty Don't call me!");
 
   return NS_ERROR_UNEXPECTED;
 }
@@ -3117,7 +3117,7 @@ nsDOMClassInfo::NewEnumerate(nsIXPConnectWrappedNative *wrapper,
                              JSContext *cx, JSObject *obj, PRUint32 enum_op,
                              jsval *statep, jsid *idp, PRBool *_retval)
 {
-  NS_ERROR("Don't call me!");
+  NS_ERROR("nsDOMClassInfo::NewEnumerate Don't call me!");
 
   return NS_ERROR_UNEXPECTED;
 }
@@ -3168,7 +3168,7 @@ nsDOMClassInfo::Convert(nsIXPConnectWrappedNative *wrapper, JSContext *cx,
                         JSObject *obj, PRUint32 type, jsval *vp,
                         PRBool *_retval)
 {
-  NS_ERROR("Don't call me!");
+  NS_ERROR("nsDOMClassInfo::Convert Don't call me!");
 
   return NS_ERROR_UNEXPECTED;
 }
@@ -3177,7 +3177,7 @@ NS_IMETHODIMP
 nsDOMClassInfo::Finalize(nsIXPConnectWrappedNative *wrapper, JSContext *cx,
                          JSObject *obj)
 {
-  NS_ERROR("Don't call me!");
+  NS_ERROR("nsDOMClassInfo::Finalize Don't call me!");
 
   return NS_ERROR_UNEXPECTED;
 }
@@ -3216,7 +3216,7 @@ nsDOMClassInfo::Call(nsIXPConnectWrappedNative *wrapper, JSContext *cx,
                      JSObject *obj, PRUint32 argc, jsval *argv, jsval *vp,
                      PRBool *_retval)
 {
-  NS_ERROR("Don't call me!");
+  NS_ERROR("nsDOMClassInfo::Call Don't call me!");
 
   return NS_ERROR_UNEXPECTED;
 }
@@ -3226,7 +3226,7 @@ nsDOMClassInfo::Construct(nsIXPConnectWrappedNative *wrapper, JSContext *cx,
                           JSObject *obj, PRUint32 argc, jsval *argv,
                           jsval *vp, PRBool *_retval)
 {
-  NS_ERROR("Don't call me!");
+  NS_ERROR("nsDOMClassInfo::Construct Don't call me!");
 
   return NS_ERROR_UNEXPECTED;
 }
@@ -3236,7 +3236,7 @@ nsDOMClassInfo::HasInstance(nsIXPConnectWrappedNative *wrapper, JSContext *cx,
                             JSObject *obj, jsval val, PRBool *bp,
                             PRBool *_retval)
 {
-  NS_ERROR("Don't call me!");
+  NS_ERROR("nsDOMClassInfo::HasInstance Don't call me!");
 
   return NS_ERROR_UNEXPECTED;
 }
@@ -3245,7 +3245,7 @@ NS_IMETHODIMP
 nsDOMClassInfo::Mark(nsIXPConnectWrappedNative *wrapper, JSContext *cx,
                      JSObject *obj, void *arg, PRUint32 *_retval)
 {
-  NS_ERROR("Don't call me!");
+  NS_ERROR("nsDOMClassInfo::Mark Don't call me!");
 
   return NS_ERROR_UNEXPECTED;
 }
@@ -3254,7 +3254,7 @@ NS_IMETHODIMP
 nsDOMClassInfo::Equality(nsIXPConnectWrappedNative *wrapper, JSContext * cx,
                          JSObject * obj, jsval val, PRBool *bp)
 {
-  NS_ERROR("Don't call me!");
+  NS_ERROR("nsDOMClassInfo::Equality Don't call me!");
 
   return NS_ERROR_UNEXPECTED;
 }
@@ -3263,7 +3263,7 @@ NS_IMETHODIMP
 nsDOMClassInfo::OuterObject(nsIXPConnectWrappedNative *wrapper, JSContext * cx,
                             JSObject * obj, JSObject * *_retval)
 {
-  NS_ERROR("Don't call me!");
+  NS_ERROR("nsDOMClassInfo::OuterObject Don't call me!");
 
   return NS_ERROR_UNEXPECTED;
 }