diff --git a/mozilla/layout/xul/base/src/outliner/src/nsOutlinerBodyFrame.cpp b/mozilla/layout/xul/base/src/outliner/src/nsOutlinerBodyFrame.cpp
index f8f69aeb272..1e9fd88c2ed 100644
--- a/mozilla/layout/xul/base/src/outliner/src/nsOutlinerBodyFrame.cpp
+++ b/mozilla/layout/xul/base/src/outliner/src/nsOutlinerBodyFrame.cpp
@@ -1210,17 +1210,19 @@ nsOutlinerBodyFrame::PrefillPropertyArray(PRInt32 aRowIndex, nsOutlinerColumn* a
     nsCOMPtr<nsIOutlinerSelection> selection;
     mView->GetSelection(getter_AddRefs(selection));
   
-    // selected
-    PRBool isSelected;
-    selection->IsSelected(aRowIndex, &isSelected);
-    if (isSelected)
-      mScratchArray->AppendElement(nsHTMLAtoms::selected);
+    if (selection) {
+      // selected
+      PRBool isSelected;
+      selection->IsSelected(aRowIndex, &isSelected);
+      if (isSelected)
+        mScratchArray->AppendElement(nsHTMLAtoms::selected);
 
-    // current
-    PRInt32 currentIndex;
-    selection->GetCurrentIndex(&currentIndex);
-    if (aRowIndex == currentIndex)
-      mScratchArray->AppendElement(nsXULAtoms::current);
+      // current
+      PRInt32 currentIndex;
+      selection->GetCurrentIndex(&currentIndex);
+      if (aRowIndex == currentIndex)
+        mScratchArray->AppendElement(nsXULAtoms::current);
+    }
 
     // container or leaf
     PRBool isContainer = PR_FALSE;
diff --git a/mozilla/layout/xul/base/src/tree/src/nsTreeBodyFrame.cpp b/mozilla/layout/xul/base/src/tree/src/nsTreeBodyFrame.cpp
index f8f69aeb272..1e9fd88c2ed 100644
--- a/mozilla/layout/xul/base/src/tree/src/nsTreeBodyFrame.cpp
+++ b/mozilla/layout/xul/base/src/tree/src/nsTreeBodyFrame.cpp
@@ -1210,17 +1210,19 @@ nsOutlinerBodyFrame::PrefillPropertyArray(PRInt32 aRowIndex, nsOutlinerColumn* a
     nsCOMPtr<nsIOutlinerSelection> selection;
     mView->GetSelection(getter_AddRefs(selection));
   
-    // selected
-    PRBool isSelected;
-    selection->IsSelected(aRowIndex, &isSelected);
-    if (isSelected)
-      mScratchArray->AppendElement(nsHTMLAtoms::selected);
+    if (selection) {
+      // selected
+      PRBool isSelected;
+      selection->IsSelected(aRowIndex, &isSelected);
+      if (isSelected)
+        mScratchArray->AppendElement(nsHTMLAtoms::selected);
 
-    // current
-    PRInt32 currentIndex;
-    selection->GetCurrentIndex(&currentIndex);
-    if (aRowIndex == currentIndex)
-      mScratchArray->AppendElement(nsXULAtoms::current);
+      // current
+      PRInt32 currentIndex;
+      selection->GetCurrentIndex(&currentIndex);
+      if (aRowIndex == currentIndex)
+        mScratchArray->AppendElement(nsXULAtoms::current);
+    }
 
     // container or leaf
     PRBool isContainer = PR_FALSE;