--- a/core/modulemanager.lua	Sun Mar 11 20:56:09 2012 +0000
+++ b/core/modulemanager.lua	Wed Mar 14 17:03:48 2012 +0000
@@ -101,11 +101,12 @@
 	end
 	
 	if mod.module.items then -- remove items
+		local events = (host == "*" and prosody.events) or hosts[host].events;
 		for key,t in pairs(mod.module.items) do
 			for i = #t,1,-1 do
 				local value = t[i];
 				t[i] = nil;
-				hosts[host].events.fire_event("item-removed/"..key, {source = mod.module, item = value});
+				events.fire_event("item-removed/"..key, {source = mod.module, item = value});
 			end
 		end
 	end