diff --git a/indra/llui/llscrolllistctrl.cpp b/indra/llui/llscrolllistctrl.cpp
index f1226202426d699c9cb000722c4980bf981445da..4884a0068c6e9e2dcd043a54adf6f064eebab57c 100644
--- a/indra/llui/llscrolllistctrl.cpp
+++ b/indra/llui/llscrolllistctrl.cpp
@@ -2068,9 +2068,10 @@ BOOL LLScrollListCtrl::handleClick(S32 x, S32 y, MASK mask)
 			for (item_list::iterator iter = mItemList.begin(); iter != mItemList.end(); iter++)
 			{
 				LLScrollListItem* item = *iter;
-				if (item->getSelected())
+				if (item && item->getSelected())
 				{
 					LLScrollListCell* cellp = item->getColumn(column_index);
+					if (!cellp) continue;
 					cellp->setValue(item_value);
 					cellp->onCommit();
 					if (mLastSelected == NULL)