diff --git a/coding/trie.hpp b/coding/trie.hpp
index 80ad5ce8d1..9e689f0c25 100644
--- a/coding/trie.hpp
+++ b/coding/trie.hpp
@@ -1,9 +1,13 @@
 #pragma once
-#include "../base/assert.hpp"
+
 #include "../base/base.hpp"
+#include "../base/assert.hpp"
 #include "../base/buffer_vector.hpp"
+//#include "../base/object_tracker.hpp"
+
 #include "../std/scoped_ptr.hpp"
 
+
 namespace trie
 {
 
@@ -17,6 +21,8 @@ static uint32_t const DEFAULT_CHAR = 0;
 template <typename ValueT, typename EdgeValueT>
 class Iterator
 {
+  //dbg::ObjectTracker m_tracker;
+
 public:
   struct Edge
   {
diff --git a/qt/main.cpp b/qt/main.cpp
index 57890c941b..d498210c14 100644
--- a/qt/main.cpp
+++ b/qt/main.cpp
@@ -6,6 +6,7 @@
 
 #include "../base/logging.hpp"
 #include "../base/macros.hpp"
+#include "../base/object_tracker.hpp"
 
 #include "../coding/file_reader.hpp"
 
@@ -109,6 +110,8 @@ int main(int argc, char * argv[])
     returnCode = a.exec();
   }
 
+  dbg::ObjectTracker::PrintLeaks();
+
   LOG_SHORT(LINFO, ("MapsWithMe finished with code", returnCode));
   return returnCode;
 }
diff --git a/search/feature_offset_match.hpp b/search/feature_offset_match.hpp
index c6b87da0cc..5871d0e7fd 100644
--- a/search/feature_offset_match.hpp
+++ b/search/feature_offset_match.hpp
@@ -4,11 +4,11 @@
 #include "../indexer/search_trie.hpp"
 
 #include "../base/string_utils.hpp"
+#include "../base/stl_add.hpp"
 //#include "../base/logging.hpp"
 
 #include "../std/algorithm.hpp"
 #include "../std/scoped_ptr.hpp"
-#include "../std/stack.hpp"
 #include "../std/unordered_set.hpp"
 #include "../std/utility.hpp"
 #include "../std/vector.hpp"
@@ -124,11 +124,12 @@ void PrefixMatchInTrie(TrieIterator const & trieRoot,
   if (!CheckMatchString(rootPrefix, rootPrefixSize, s))
       return;
 
-  stack<search::TrieIterator *> trieQueue;
+  typedef vector<search::TrieIterator *> QueueT;
+  QueueT trieQueue;
   {
     size_t symbolsMatched = 0;
     bool bFullEdgeMatched;
-    search::TrieIterator * const pRootIter =
+    search::TrieIterator * pRootIter =
         MoveTrieIteratorToString(trieRoot, s, symbolsMatched, bFullEdgeMatched);
 
     UNUSED_VALUE(symbolsMatched);
@@ -137,19 +138,25 @@ void PrefixMatchInTrie(TrieIterator const & trieRoot,
     if (!pRootIter)
       return;
 
-    trieQueue.push(pRootIter);
+    trieQueue.push_back(pRootIter);
   }
 
+  // 'f' can throw an exception. So be prepared to delete unprocessed elements.
+  DeleteRangeGuard<QueueT> doDelete(trieQueue);
+  UNUSED_VALUE(doDelete);
+
   while (!trieQueue.empty())
   {
-    scoped_ptr<search::TrieIterator> pIter(trieQueue.top());
-    trieQueue.pop();
+    // Next 2 lines don't throw any exceptions while moving
+    // ownership from container to smart pointer.
+    scoped_ptr<search::TrieIterator> pIter(trieQueue.back());
+    trieQueue.pop_back();
 
     for (size_t i = 0; i < pIter->m_value.size(); ++i)
       f(pIter->m_value[i]);
 
     for (size_t i = 0; i < pIter->m_edge.size(); ++i)
-      trieQueue.push(pIter->GoToEdge(i));
+      trieQueue.push_back(pIter->GoToEdge(i));
   }
 }