1 files changed, 2 insertions, 1 deletions
diff --git a/src/components/application_manager/src/mobile_message_handler.cc b/src/components/application_manager/src/mobile_message_handler.cc
index 2f06c5f3b5..1ee368a212 100644
--- a/src/components/application_manager/src/mobile_message_handler.cc
+++ b/src/components/application_manager/src/mobile_message_handler.cc
@@ -143,6 +143,7 @@ MobileMessageHandler::HandleIncomingMessageProtocolV1(
               message->service_type()));
   if (!message) {
     NOTREACHED();
+    delete outgoing_message;
     return NULL;
   }
 
@@ -178,7 +179,7 @@ MobileMessageHandler::HandleIncomingMessageProtocolV2(
     return NULL;
   }
 
-  std::auto_ptr<application_manager::Message> outgoing_message(
+  std::unique_ptr<application_manager::Message> outgoing_message(
       new application_manager::Message(
           protocol_handler::MessagePriority::FromServiceType(
               message->service_type())));