diff --git a/indra/newview/llinventorypanel.cpp b/indra/newview/llinventorypanel.cpp
index cdd7e1c1c..3cebf09e3 100644
--- a/indra/newview/llinventorypanel.cpp
+++ b/indra/newview/llinventorypanel.cpp
@@ -879,22 +879,23 @@ LLFolderViewItem* LLInventoryPanel::buildNewViews(const LLUUID& id)
 				}
 				folder_view_item = folderp;
 			}
-		}
-		else
-		{
-			// Build new view for item.
-			LLInventoryItem* item = (LLInventoryItem*)objectp;
-			LLInvFVBridge* new_listener = mInvFVBridgeBuilder->createBridge(item->getType(),
-			item->getActualType(),
-			item->getInventoryType(),
-																			this,
-																			mFolderRoot.get(),
-																			item->getUUID(),
-																			item->getFlags());
-
-			if (new_listener)
+			else
 			{
-				folder_view_item = createFolderViewItem(new_listener);
+				// Build new view for item.
+				const LLInventoryItem* item = (LLInventoryItem*)objectp;
+				llassert_always(item);
+				LLInvFVBridge* new_listener = mInvFVBridgeBuilder->createBridge(item->getType(),
+				item->getActualType(),
+				item->getInventoryType(),
+																				this,
+																				mFolderRoot.get(),
+																				item->getUUID(),
+																				item->getFlags());
+
+				if (new_listener)
+				{
+					folder_view_item = createFolderViewItem(new_listener);
+				}
 			}
 		}