diff --git a/components/convenience/conveniencecomponent.cpp b/components/convenience/conveniencecomponent.cpp
index 18af2f0ce..44ffae929 100644
--- a/components/convenience/conveniencecomponent.cpp
+++ b/components/convenience/conveniencecomponent.cpp
@@ -125,7 +125,7 @@ void ConvenienceComponent::HostCommittedHandler(const ConfigItem::Ptr& item)
 
 				string parent;
 				if (!service->GetProperty("service", &parent))
-					parent = string(svcdesc);
+					parent = svcname;
 
 				builder->AddParent(parent);
 
@@ -161,6 +161,9 @@ void ConvenienceComponent::HostRemovedHandler(const ConfigItem::Ptr& item)
 
 	ConfigObject::Ptr host = item->GetConfigObject();
 
+	if (!host)
+		return;
+
 	Dictionary::Ptr services;
 	host->GetTag("convenience-services", &services);