diff --git a/drape_frontend/message_queue.cpp b/drape_frontend/message_queue.cpp
index d67b4c68f9..dfbaa0091e 100644
--- a/drape_frontend/message_queue.cpp
+++ b/drape_frontend/message_queue.cpp
@@ -37,12 +37,12 @@ void MessageQueue::PushMessage(dp::TransferPointer<Message> message, MessagePrio
   {
   case MessagePriority::Normal:
     {
-      m_messages.push_back(dp::MasterPointer<Message>(message));
+      m_messages.emplace_back(message);
       break;
     }
   case MessagePriority::High:
     {
-      m_messages.insert(m_messages.begin(), dp::MasterPointer<Message>(message));
+      m_messages.emplace_front(message);
       break;
     }
   default:
diff --git a/map/framework.cpp b/map/framework.cpp
index fd9254351d..717c9205ae 100644
--- a/map/framework.cpp
+++ b/map/framework.cpp
@@ -897,6 +897,8 @@ void Framework::EnterBackground()
 #ifndef OMIM_OS_ANDROID
   ClearAllCaches();
 #endif
+
+  ASSERT(!m_drapeEngine.IsNull(), ("Drape engine has not been initialized yet"));
   if (!m_drapeEngine.IsNull())
     m_drapeEngine->SetRenderingEnabled(false);
 }
@@ -905,6 +907,7 @@ void Framework::EnterForeground()
 {
   m_startForegroundTime = my::Timer::LocalTime();
 
+  ASSERT(!m_drapeEngine.IsNull(), ("Drape engine has not been initialized yet"));
   if (!m_drapeEngine.IsNull())
     m_drapeEngine->SetRenderingEnabled(true);
 }