--- a/plugins/mod_pep_plus.lua	Wed Apr 11 13:24:37 2018 +0100
+++ b/plugins/mod_pep_plus.lua	Wed Apr 11 15:52:13 2018 +0200
@@ -268,7 +268,6 @@
 end
 
 local function update_subscriptions(recipient, service_name, nodes)
-	local service = get_pep_service(service_name);
 	nodes = nodes or empty_set;
 
 	local service_recipients = recipients[service_name];
@@ -286,6 +285,7 @@
 		return;
 	end
 
+	local service = get_pep_service(service_name);
 	for node in current - nodes do
 		service:remove_subscription(node, recipient, recipient);
 	end