diff --git a/indra/newview/llhudicon.cpp b/indra/newview/llhudicon.cpp
index 9da28a2de..6b9ad6a17 100644
--- a/indra/newview/llhudicon.cpp
+++ b/indra/newview/llhudicon.cpp
@@ -213,7 +213,7 @@ BOOL LLHUDIcon::lineSegmentIntersect(const LLVector3& start, const LLVector3& en
 	if (mHidden)
 		return FALSE;
 
-	if (mSourceObject.isNull() || mImagep.isNull())
+	if (mSourceObject.isNull() || mImagep.isNull() || mSourceObject->mDrawable.isNull())
 	{
 		markDead();
 		return FALSE;
diff --git a/indra/newview/skins/default/xui/en-us/panel_preferences_network.xml b/indra/newview/skins/default/xui/en-us/panel_preferences_network.xml
index c1040da37..6d5f5ffbe 100644
--- a/indra/newview/skins/default/xui/en-us/panel_preferences_network.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_preferences_network.xml
@@ -29,7 +29,7 @@
 	</text>
 	<slider bottom_delta="-25" can_edit_text="true"
 	     decimal_digits="0" enabled="true" follows="left|top" height="15"
-	     increment="64" initial_val="1024" left_delta="0" max_val="9984" min_val="64"
+	     increment="64" initial_val="1024" left_delta="0" max_val="2048" min_val="64"
 	     mouse_opaque="true" name="cache_size" show_text="true" width="180" />
 	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 	     bottom_delta="4" drop_shadow_visible="true" enabled="true"