diff --git a/indra/llui/llconsole.cpp b/indra/llui/llconsole.cpp
index cb4a896242..b25610cb29 100644
--- a/indra/llui/llconsole.cpp
+++ b/indra/llui/llconsole.cpp
@@ -342,7 +342,7 @@ void LLConsole::addConsoleLine(const LLWString& wline, const LLColor4 &color, LL
 	{
 		LLUrlMatch urlMatch;
 		LLWString workLine = wline;
-		while (LLUrlRegistry::instance().findUrl(workLine, urlMatch))
+		while (LLUrlRegistry::instance().findUrl(workLine, urlMatch) && !urlMatch.getUrl().empty())
 		{
 			LLWStringUtil::replaceString(newLine, utf8str_to_wstring(urlMatch.getUrl()), utf8str_to_wstring(urlMatch.getLabel()));
 
diff --git a/indra/newview/growlmanager.cpp b/indra/newview/growlmanager.cpp
index ab0dd9de02..dea69b05f6 100644
--- a/indra/newview/growlmanager.cpp
+++ b/indra/newview/growlmanager.cpp
@@ -210,7 +210,7 @@ bool GrowlManager::onLLNotification(const LLSD& notice)
 			LLUrlMatch urlMatch;
 			LLWString newLine = utf8str_to_wstring(body);
 			LLWString workLine = utf8str_to_wstring(body);
-			while (LLUrlRegistry::instance().findUrl(workLine, urlMatch))
+			while (LLUrlRegistry::instance().findUrl(workLine, urlMatch) && !urlMatch.getUrl().empty())
 			{
 				LLWStringUtil::replaceString(newLine, utf8str_to_wstring(urlMatch.getUrl()), utf8str_to_wstring(urlMatch.getLabel()));