diff --git a/drape/font_texture.cpp b/drape/font_texture.cpp
index 1c157c1168..817ad66d37 100644
--- a/drape/font_texture.cpp
+++ b/drape/font_texture.cpp
@@ -86,7 +86,7 @@ GlyphIndex::GlyphIndex(m2::PointU size, RefPointer<GlyphManager> mng)
 GlyphInfo const * GlyphIndex::MapResource(GlyphKey const & key)
 {
   strings::UniChar uniChar = key.GetUnicodePoint();
-  TResourceMapping::const_iterator it = m_index.find(uniChar);
+  auto it = m_index.find(uniChar);
   if (it != m_index.end())
     return it->second.GetRaw();
 
@@ -100,10 +100,8 @@ GlyphInfo const * GlyphIndex::MapResource(GlyphKey const & key)
 
   m_pendingNodes.emplace_back(r, glyph);
 
-  pair<TResourceMapping::iterator, bool> res = m_index.emplace(uniChar, TResourcePtr(new GlyphInfo(m_packer.MapTextureCoords(r), glyph.m_metrics)));
-  if (!res.second)
-    return nullptr;
-
+  auto res = m_index.emplace(uniChar, TResourcePtr(new GlyphInfo(m_packer.MapTextureCoords(r), glyph.m_metrics)));
+  ASSERT(!res.second, ());
   return res.first->second.GetRaw();
 }
 
diff --git a/qt_tstfrm/qt_tstfrm.pro b/qt_tstfrm/qt_tstfrm.pro
index 3e8fe9bda4..f55ba065ee 100644
--- a/qt_tstfrm/qt_tstfrm.pro
+++ b/qt_tstfrm/qt_tstfrm.pro
@@ -13,10 +13,10 @@ HEADERS += \
   macros.hpp \
   gl_test_widget.hpp \
   gui_test_widget.hpp \
-    test_main_loop.hpp
+  test_main_loop.hpp \
 
 SOURCES += \
   tstwidgets.cpp \
-    test_main_loop.cpp
+  test_main_loop.cpp \