diff --git a/mozilla/accessible/src/atk/nsDocAccessibleWrap.cpp b/mozilla/accessible/src/atk/nsDocAccessibleWrap.cpp
index b18133793ff..eb3101a1a1e 100644
--- a/mozilla/accessible/src/atk/nsDocAccessibleWrap.cpp
+++ b/mozilla/accessible/src/atk/nsDocAccessibleWrap.cpp
@@ -118,6 +118,7 @@ NS_IMETHODIMP nsDocAccessibleWrap::FireToolkitEvent(PRUint32 aEvent,
     case nsIAccessibleEvent::EVENT_STATE_CHANGE:
       {
         MAI_LOG_DEBUG(("\n\nReceived: EVENT_STATE_CHANGE\n"));
+        NS_ASSERTION(aEventData, "Event needs event data");
         if (!aEventData)
             break;
 
@@ -151,6 +152,7 @@ NS_IMETHODIMP nsDocAccessibleWrap::FireToolkitEvent(PRUint32 aEvent,
         AtkPropertyValues values = { NULL };
 
         MAI_LOG_DEBUG(("\n\nReceived: EVENT_ATK_PROPERTY_CHANGE\n"));
+        NS_ASSERTION(aEventData, "Event needs event data");
         if (!aEventData)
             break;
 
@@ -239,6 +241,7 @@ NS_IMETHODIMP nsDocAccessibleWrap::FireToolkitEvent(PRUint32 aEvent,
         AtkTextChange *pAtkTextChange;
 
         MAI_LOG_DEBUG(("\n\nReceived: EVENT_ATK_TEXT_CHANGE\n"));
+        NS_ASSERTION(aEventData, "Event needs event data");
         if (!aEventData)
             break;
 
@@ -260,6 +263,7 @@ NS_IMETHODIMP nsDocAccessibleWrap::FireToolkitEvent(PRUint32 aEvent,
 
     case nsIAccessibleEvent::EVENT_ATK_TEXT_CARET_MOVE:
         MAI_LOG_DEBUG(("\n\nReceived: EVENT_ATK_TEXT_CARET_MOVE\n"));
+        NS_ASSERTION(aEventData, "Event needs event data");
         if (!aEventData)
             break;
 
@@ -280,6 +284,7 @@ NS_IMETHODIMP nsDocAccessibleWrap::FireToolkitEvent(PRUint32 aEvent,
 
     case nsIAccessibleEvent::EVENT_ATK_TABLE_ROW_INSERT:
         MAI_LOG_DEBUG(("\n\nReceived: EVENT_ATK_TABLE_ROW_INSERT\n"));
+        NS_ASSERTION(aEventData, "Event needs event data");
         if (!aEventData)
             break;
 
@@ -296,6 +301,7 @@ NS_IMETHODIMP nsDocAccessibleWrap::FireToolkitEvent(PRUint32 aEvent,
         
     case nsIAccessibleEvent::EVENT_ATK_TABLE_ROW_DELETE:
         MAI_LOG_DEBUG(("\n\nReceived: EVENT_ATK_TABLE_ROW_DELETE\n"));
+        NS_ASSERTION(aEventData, "Event needs event data");
         if (!aEventData)
             break;
 
@@ -319,6 +325,7 @@ NS_IMETHODIMP nsDocAccessibleWrap::FireToolkitEvent(PRUint32 aEvent,
 
     case nsIAccessibleEvent::EVENT_ATK_TABLE_COLUMN_INSERT:
         MAI_LOG_DEBUG(("\n\nReceived: EVENT_ATK_TABLE_COLUMN_INSERT\n"));
+        NS_ASSERTION(aEventData, "Event needs event data");
         if (!aEventData)
             break;
 
@@ -335,6 +342,7 @@ NS_IMETHODIMP nsDocAccessibleWrap::FireToolkitEvent(PRUint32 aEvent,
 
     case nsIAccessibleEvent::EVENT_ATK_TABLE_COLUMN_DELETE:
         MAI_LOG_DEBUG(("\n\nReceived: EVENT_ATK_TABLE_COLUMN_DELETE\n"));
+        NS_ASSERTION(aEventData, "Event needs event data");
         if (!aEventData)
             break;
 
diff --git a/mozilla/accessible/src/base/nsDocAccessible.cpp b/mozilla/accessible/src/base/nsDocAccessible.cpp
index 0244997820a..f9b378148fa 100644
--- a/mozilla/accessible/src/base/nsDocAccessible.cpp
+++ b/mozilla/accessible/src/base/nsDocAccessible.cpp
@@ -727,7 +727,7 @@ NS_IMETHODIMP nsDocAccessible::FireDocLoadEvents(PRUint32 aEventType)
       mDocLoadTimer->InitWithFuncCallback(DocLoadCallback, this, 0,
                                           nsITimer::TYPE_ONE_SHOT);
     }
-    //fire EVENT_STATE_CHANGE to clear STATE_BUSY
+    // Finished loading: fire EVENT_STATE_CHANGE to clear STATE_BUSY
     StateChange stateData;
     stateData.state = STATE_BUSY;
     stateData.enable = PR_FALSE;
@@ -744,7 +744,11 @@ NS_IMETHODIMP nsDocAccessible::FireDocLoadEvents(PRUint32 aEventType)
       return NS_OK; 
     }
 
-    FireToolkitEvent(nsIAccessibleEvent::EVENT_STATE_CHANGE, this, nsnull);
+    // Loading document: fire EVENT_STATE_CHANGE to set STATE_BUSY
+    StateChange stateData;
+    stateData.state = STATE_BUSY;
+    stateData.enable = PR_TRUE;
+    FireToolkitEvent(nsIAccessibleEvent::EVENT_STATE_CHANGE, this, &stateData);
   }
 
   FireToolkitEvent(aEventType, this, nsnull);