1 files changed, 9 insertions, 0 deletions
diff --git a/src/components/application_manager/src/commands/mobile/on_way_point_change_notification.cc b/src/components/application_manager/src/commands/mobile/on_way_point_change_notification.cc
index 0b24228810..51073d919f 100644
--- a/src/components/application_manager/src/commands/mobile/on_way_point_change_notification.cc
+++ b/src/components/application_manager/src/commands/mobile/on_way_point_change_notification.cc
@@ -46,6 +46,15 @@ OnWayPointChangeNotification::~OnWayPointChangeNotification() {}
 void OnWayPointChangeNotification::Run() {
   LOG4CXX_AUTO_TRACE(logger_);
 
+  if (!ValidateSmartObjectStrings(
+          (*message_)[strings::msg_params][strings::way_points])) {
+    LOG4CXX_ERROR(logger_, "Invalid notification. Ignored");
+    return;
+  }
+
+  application_manager_.SetWaypointsInfo(
+      (*message_)[strings::msg_params][strings::way_points]);
+
   std::set<int32_t> subscribed_for_way_points =
       application_manager_.GetAppsSubscribedForWayPoints();