diff --git a/indexer/rank_table.cpp b/indexer/rank_table.cpp
index 93b78ff52e..c83ba77281 100644
--- a/indexer/rank_table.cpp
+++ b/indexer/rank_table.cpp
@@ -221,7 +221,10 @@ void SerializeRankTable(RankTable & table, string const & mapPath)
 template <typename TRegion>
 unique_ptr<RankTable> LoadRankTable(unique_ptr<TRegion> && region)
 {
-  if (!region || !region->ImmutableData() || region->Size() < kHeaderSize)
+  if (!region || !region->ImmutableData())
+    return unique_ptr<RankTable>();
+
+  if (region->Size() < kHeaderSize)
   {
     LOG(LERROR, ("Invalid RankTable format."));
     return unique_ptr<RankTable>();