diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp
index 5ea9f5b6ccf714daf7aa597a6ca29c6ea98ca025..69038a8627552e90cafbe0c2585ac9f5b3e3ca73 100644
--- a/indra/llui/llfloater.cpp
+++ b/indra/llui/llfloater.cpp
@@ -2321,7 +2321,10 @@ void LLFloaterView::restoreAll()
 	for ( child_list_const_iter_t child_it = getChildList()->begin(); child_it != getChildList()->end(); ++child_it)
 	{
 		LLFloater* floaterp = (LLFloater*)*child_it;
-		floaterp->setMinimized(FALSE);
+		if (floaterp)
+		{
+			floaterp->setMinimized(FALSE);
+		}
 	}
 
 	// *FIX: make sure dependents are restored