1 files changed, 5 insertions, 3 deletions
diff --git a/src/components/remote_control/src/resource_allocation_manager_impl.cc b/src/components/remote_control/src/resource_allocation_manager_impl.cc
index ecb07bb349..233cc79764 100644
--- a/src/components/remote_control/src/resource_allocation_manager_impl.cc
+++ b/src/components/remote_control/src/resource_allocation_manager_impl.cc
@@ -162,15 +162,16 @@ void ResourceAllocationManagerImpl::ProcessApplicationPolicyUpdate() {
 RCAppExtensionPtr ResourceAllocationManagerImpl::GetApplicationExtention(
     application_manager::ApplicationSharedPtr application) {
   LOG4CXX_AUTO_TRACE(logger_);
+
+  RCAppExtensionPtr rc_app_extension;
   if (!application) {
-    return NULL;
+    return rc_app_extension;
   }
 
-  RCAppExtensionPtr rc_app_extension;
   application_manager::AppExtensionPtr app_extension =
       application->QueryInterface(rc_plugin_.GetModuleID());
   if (!app_extension) {
-    return NULL;
+    return rc_app_extension;
   }
 
   rc_app_extension =
@@ -181,6 +182,7 @@ RCAppExtensionPtr ResourceAllocationManagerImpl::GetApplicationExtention(
 }
 
 void ResourceAllocationManagerImpl::RemoveAppsSubscriptions(const Apps& apps) {
+  LOG4CXX_AUTO_TRACE(logger_);
   Apps::const_iterator app = apps.begin();
   for (; apps.end() != app; ++app) {
     application_manager::ApplicationSharedPtr app_ptr = *app;