diff --git a/libnymea-core/integrations/thingmanagerimplementation.cpp b/libnymea-core/integrations/thingmanagerimplementation.cpp index 1609c963..4f0d4380 100644 --- a/libnymea-core/integrations/thingmanagerimplementation.cpp +++ b/libnymea-core/integrations/thingmanagerimplementation.cpp @@ -742,7 +742,12 @@ Thing::ThingError ThingManagerImplementation::removeConfiguredThing(const ThingI if (!thing) { return Thing::ThingErrorThingNotFound; } - m_integrationPlugins.value(thing->pluginId())->thingRemoved(thing); + IntegrationPlugin *plugin = m_integrationPlugins.value(thing->pluginId()); + if (!plugin) { + qCWarning(dcThingManager()).nospace() << "Plugin not loaded for thing " << thing->name() << ". Not calling thingRemoved on plugin."; + } else { + plugin->thingRemoved(thing); + } thing->deleteLater();