1 files changed, 8 insertions, 2 deletions
diff --git a/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/src/commands/mobile/publish_app_service_request.cc b/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/src/commands/mobile/publish_app_service_request.cc
index bb0855d42f..86819b44ad 100644
--- a/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/src/commands/mobile/publish_app_service_request.cc
+++ b/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/src/commands/mobile/publish_app_service_request.cc
@@ -99,8 +99,7 @@ void PublishAppServiceRequest::Run() {
   if (!result) {
     SendResponse(false,
                  mobile_apis::Result::DISALLOWED,
-                 "Service disallowed by policies",
-                 NULL);
+                 "Service disallowed by policies");
     return;
   }
 
@@ -111,6 +110,13 @@ void PublishAppServiceRequest::Run() {
   smart_objects::SmartObject service_record =
       application_manager_.GetAppServiceManager().PublishAppService(
           manifest, true, connection_key());
+
+  if (service_record.empty()) {
+    SendResponse(
+        false, mobile_apis::Result::REJECTED, "Failed to publish service");
+    return;
+  }
+
   if (app->IsFullscreen()) {
     // Service should be activated if app is in the foreground
     application_manager_.GetAppServiceManager().ActivateAppService(