diff --git a/mozilla/accessible/src/xul/nsXULFormControlAccessible.cpp b/mozilla/accessible/src/xul/nsXULFormControlAccessible.cpp
index 670aeecc1f3..09b453d1aed 100644
--- a/mozilla/accessible/src/xul/nsXULFormControlAccessible.cpp
+++ b/mozilla/accessible/src/xul/nsXULFormControlAccessible.cpp
@@ -138,7 +138,6 @@ NS_IMETHODIMP nsXULButtonAccessible::GetState(PRUint32 *aState)
   }
 
   nsCOMPtr<nsIDOMElement> element(do_QueryInterface(mDOMNode));
-  NS_ASSERTION(element, "No nsIDOMElement for button node!");
   if (element) {
     PRBool isDefault = PR_FALSE;
     element->HasAttribute(NS_LITERAL_STRING("default"), &isDefault) ;
diff --git a/mozilla/accessible/src/xul/nsXULMenuAccessible.cpp b/mozilla/accessible/src/xul/nsXULMenuAccessible.cpp
index b7776e4eb2a..93f3610bb4b 100644
--- a/mozilla/accessible/src/xul/nsXULMenuAccessible.cpp
+++ b/mozilla/accessible/src/xul/nsXULMenuAccessible.cpp
@@ -62,7 +62,8 @@ NS_IMETHODIMP nsXULMenuitemAccessible::GetState(PRUint32 *_retval)
 
   // Focused?
   nsCOMPtr<nsIDOMElement> element(do_QueryInterface(mDOMNode));
-  NS_ASSERTION(element, "No DOM element for menu  node!");
+  if (!element)
+    return NS_ERROR_FAILURE;
   PRBool isFocused = PR_FALSE;
   element->HasAttribute(NS_LITERAL_STRING("_moz-menuactive"), &isFocused); 
   if (isFocused)
@@ -111,7 +112,9 @@ NS_IMETHODIMP nsXULMenuitemAccessible::GetState(PRUint32 *_retval)
 NS_IMETHODIMP nsXULMenuitemAccessible::GetName(nsAString& _retval)
 {
   nsCOMPtr<nsIDOMElement> element(do_QueryInterface(mDOMNode));
-  NS_ASSERTION(element, "No DOM element for menu  node!");
+  if (!element) {
+    return NS_ERROR_FAILURE;
+  }
   element->GetAttribute(NS_LITERAL_STRING("label"), _retval); 
 
   return NS_OK;