diff --git a/src/common/StringParser.hxx b/src/common/StringParser.hxx
index 7ad0d53bf..06ff6ad18 100644
--- a/src/common/StringParser.hxx
+++ b/src/common/StringParser.hxx
@@ -64,10 +64,10 @@ class StringParser
         else
         {
           size_t beg = 0;
-          while((beg+maxlen) < size)
+          while((beg + maxlen) < size)
           {
-            size_t spos = line.find_last_of(' ', beg+len);
-            if(spos > beg)
+            size_t spos = line.find_last_of(' ', beg + len);
+            if(spos != string::npos && spos > beg)
               len = spos - beg;
 
             myStringList.push_back(line.substr(beg, len));