diff --git a/layout/html/table/src/nsCellMap.cpp b/layout/html/table/src/nsCellMap.cpp
index 8a2a13461905..416ea85e2e55 100644
--- a/layout/html/table/src/nsCellMap.cpp
+++ b/layout/html/table/src/nsCellMap.cpp
@@ -265,10 +265,10 @@ nsTableCellMap::InsertRows(nsTableRowGroupFrame& aParent,
     rowIndex -= cellMap->GetRowCount();
     cellMap = cellMap->GetNextSibling();
   }
-  // if we get here it is because of a nested tree row group
-  if (mFirstMap) {
-    mFirstMap->InsertRows(*this, aRows, aFirstRowIndex, aConsiderSpans);
-  }
+  
+  NS_ASSERTION(PR_FALSE, "Attempt to insert row into wrong map.");
+  /*if (mFirstMap)
+    mFirstMap->InsertRows(*this, aRows, aFirstRowIndex, aConsiderSpans);*/
 }
 
 void
diff --git a/layout/tables/nsCellMap.cpp b/layout/tables/nsCellMap.cpp
index 8a2a13461905..416ea85e2e55 100644
--- a/layout/tables/nsCellMap.cpp
+++ b/layout/tables/nsCellMap.cpp
@@ -265,10 +265,10 @@ nsTableCellMap::InsertRows(nsTableRowGroupFrame& aParent,
     rowIndex -= cellMap->GetRowCount();
     cellMap = cellMap->GetNextSibling();
   }
-  // if we get here it is because of a nested tree row group
-  if (mFirstMap) {
-    mFirstMap->InsertRows(*this, aRows, aFirstRowIndex, aConsiderSpans);
-  }
+  
+  NS_ASSERTION(PR_FALSE, "Attempt to insert row into wrong map.");
+  /*if (mFirstMap)
+    mFirstMap->InsertRows(*this, aRows, aFirstRowIndex, aConsiderSpans);*/
 }
 
 void
diff --git a/layout/xul/base/src/nsTreeRowGroupFrame.cpp b/layout/xul/base/src/nsTreeRowGroupFrame.cpp
index cce3eb1f4892..4c877c2bc3e7 100644
--- a/layout/xul/base/src/nsTreeRowGroupFrame.cpp
+++ b/layout/xul/base/src/nsTreeRowGroupFrame.cpp
@@ -1368,10 +1368,10 @@ nsTreeRowGroupFrame::GetNextFrameForReflow(nsIPresContext* aPresContext, nsIFram
         //PostAppendRow(*aResult, aPresContext, tableFrame->GetColCount());
       }
     }
-
-    mBottomFrame = *aResult;
-    return;
   }
+
+  mBottomFrame = *aResult;
+  return;
 } 
 
 NS_IMETHODIMP