diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp
index 0aeaf9878..629235571 100644
--- a/indra/newview/llviewerregion.cpp
+++ b/indra/newview/llviewerregion.cpp
@@ -1828,7 +1828,7 @@ std::string LLViewerRegion::getCapability(const std::string& name) const
 {
 	if (!capabilitiesReceived() && (name!=std::string("Seed")) && (name!=std::string("ObjectMedia")))
 	{
-		llwarns << "getCapability called before caps received" << llendl;
+		llwarns << "getCapability("<<name<<") called before caps received" << llendl;
 	}
 	
 	CapabilityMap::const_iterator iter = mImpl->mCapabilities.find(name);
diff --git a/indra/newview/llvoiceclient.cpp b/indra/newview/llvoiceclient.cpp
index b0cc19cd7..d7761909a 100644
--- a/indra/newview/llvoiceclient.cpp
+++ b/indra/newview/llvoiceclient.cpp
@@ -1579,7 +1579,7 @@ void LLVoiceClient::stateMachine()
 		LLViewerRegion *region = gAgent.getRegion();
 		LLParcel *parcel = LLViewerParcelMgr::getInstance()->getAgentParcel();
 		
-		if(region && parcel)
+		if(region && parcel && region->capabilitiesReceived())
 		{
 			S32 parcelLocalID = parcel->getLocalID();
 			std::string regionName = region->getName();
@@ -1876,7 +1876,7 @@ void LLVoiceClient::stateMachine()
 			{
 				LLViewerRegion *region = gAgent.getRegion();
 				
-				if(region)
+				if(region && region->capabilitiesReceived())
 				{
 					if ( region->getCapability("ProvisionVoiceAccountRequest") != "" )
 					{