diff --git a/storage/storage_builder.cpp b/storage/storage_builder.cpp
index cbdb35a..888669c 100644
--- a/storage/storage_builder.cpp
+++ b/storage/storage_builder.cpp
@@ -42,7 +42,9 @@ bool EncodeTitle(string & s)
   if (i != string::npos)
   {
     s = s.substr(i+1);
-    return !s.empty();
+
+    if (s.empty())
+      return false;
   }
 
   replace(s.begin(), s.end(), '_', ' ');