diff --git a/indra/llcommon/llstring.h b/indra/llcommon/llstring.h
index 5261b26fd0..181d7f3334 100644
--- a/indra/llcommon/llstring.h
+++ b/indra/llcommon/llstring.h
@@ -1330,6 +1330,10 @@ void LLStringUtilBase<T>::removeCRLF(string_type& string)
 template<class T> 
 void LLStringUtilBase<T>::removeWindowsCR(string_type& string)
 {
+    if (string.empty())
+    {
+        return;
+    }
     const T LF = 10;
     const T CR = 13;