diff --git a/mozilla/accessible/src/base/nsAccessible.cpp b/mozilla/accessible/src/base/nsAccessible.cpp
index 638165957b7..35e6aaea5c1 100644
--- a/mozilla/accessible/src/base/nsAccessible.cpp
+++ b/mozilla/accessible/src/base/nsAccessible.cpp
@@ -145,7 +145,7 @@ NS_IMETHODIMP nsAccessible::GetName(nsAString& aName)
     return NS_ERROR_FAILURE;  // Node shut down
   }
 
-  PRBool canAggregateName = !mRoleMapEntry ||
+  PRBool canAggregateName = mRoleMapEntry &&
                             mRoleMapEntry->nameRule == eNameOkFromChildren;
 
   if (content->IsContentOfType(nsIContent::eHTML)) {
diff --git a/mozilla/accessible/src/html/nsHTMLTextAccessible.h b/mozilla/accessible/src/html/nsHTMLTextAccessible.h
index 3e34870444c..43fa4b5ff13 100644
--- a/mozilla/accessible/src/html/nsHTMLTextAccessible.h
+++ b/mozilla/accessible/src/html/nsHTMLTextAccessible.h
@@ -126,6 +126,7 @@ public:
   NS_IMETHOD Shutdown() { nsresult rv = nsAccessibleWrap::Shutdown(); mBulletAccessible = nsnull; return rv; }
   NS_IMETHOD GetRole(PRUint32 *aRole) { *aRole = ROLE_LISTITEM; return NS_OK; }
   NS_IMETHOD GetState(PRUint32 *aState) { nsAccessibleWrap::GetState(aState); *aState &= ~STATE_FOCUSABLE; *aState |= STATE_READONLY; return NS_OK; }
+  NS_IMETHOD GetName(nsAString& aName) { aName.SetIsVoid(PR_TRUE); return NS_OK; }
   NS_IMETHOD GetBounds(PRInt32 *x, PRInt32 *y, PRInt32 *width, PRInt32 *height);
   void CacheChildren(PRBool aWalkAnonContent);  // Include bullet accessible
 protected: