diff --git a/indra/newview/lltexturefetch.cpp b/indra/newview/lltexturefetch.cpp
index 2f9087991dcb0364dc0dcfb3a0d3dfcfdc4d910d..5eafb6351ee6c044e51852bb02d8e5aee8a641a5 100644
--- a/indra/newview/lltexturefetch.cpp
+++ b/indra/newview/lltexturefetch.cpp
@@ -1394,7 +1394,9 @@ bool LLTextureFetchWorker::doWork(S32 param)
 		//
 		// If it looks like we're busy, keep this request here.
 		// Otherwise, advance into the HTTP states.
-		if (mFetcher->getHttpWaitersCount() || ! acquireHttpSemaphore())
+        
+		if (!mHttpHasResource && // sometimes we get into this state when we already have an http resource, go ahead and send the request in that case
+            (mFetcher->getHttpWaitersCount() || ! acquireHttpSemaphore()))
 		{
 			setState(WAIT_HTTP_RESOURCE2);
 			mFetcher->addHttpWaiter(this->mID);
diff --git a/indra/newview/lltoolpie.cpp b/indra/newview/lltoolpie.cpp
index 8dba8c6630b5b16ad1a90668f19a5a6009f5dafc..454be9d6eeec43e1672cded4bbd14dc2b5d8c4c0 100644
--- a/indra/newview/lltoolpie.cpp
+++ b/indra/newview/lltoolpie.cpp
@@ -132,11 +132,9 @@ BOOL LLToolPie::handleMouseDown(S32 x, S32 y, MASK mask)
 	// left mouse down always picks transparent (but see handleMouseUp).
 	// Also see LLToolPie::handleHover() - priorities are a bit different there.
 	// Todo: we need a more consistent set of rules to work with
-	if (transp_object == visible_object || !visible_object)
+	if (transp_object == visible_object || !visible_object || 
+        !transp_object) // avoid potential for null dereference below, don't make assumptions about behavior of pickImmediate
 	{
-		// Note: if transparent object is null, then visible object is also null
-		// since transparent pick includes non-tranpsarent one.
-		// !transparent_object check will be covered by transparent_object == visible_object.
 		mPick = transparent_pick;
 	}
 	else if( !transp_object)