diff --git a/indra/newview/llinventorypanel.cpp b/indra/newview/llinventorypanel.cpp
index 619f6d6da126875b28f9b4a13505ca1a5883c479..6b29dbadf908e0e609c0eeea4b3560cc2876f9f2 100644
--- a/indra/newview/llinventorypanel.cpp
+++ b/indra/newview/llinventorypanel.cpp
@@ -619,7 +619,7 @@ void LLInventoryPanel::itemChanged(const LLUUID& item_id, U32 mask, const LLInve
             }
 
 			// Select any newly created object that has the auto rename at top of folder root set.
-			if(mFolderRoot.get()->getRoot()->needsAutoRename())
+			if(mFolderRoot.get() && mFolderRoot.get()->getRoot() && mFolderRoot.get()->getRoot()->needsAutoRename())
 			{
 				setSelection(item_id, FALSE);
 			}