# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1396364601 -3600
# Node ID 5d73412aa1ba39081683ab922575eae93e4e867a
# Parent  e447601cf13ce99db8edbf4a0ad4ee39c6d628d0# Parent  6d410ffd6e13050eae0cdb94aa869880a2e57c63
Merge

diff -r e447601cf13c -r 5d73412aa1ba plugins/muc/muc.lib.lua
--- a/plugins/muc/muc.lib.lua	Tue Apr 01 15:02:36 2014 +0100
+++ b/plugins/muc/muc.lib.lua	Tue Apr 01 16:03:21 2014 +0100
@@ -1060,7 +1060,7 @@
 	if actor_jid == true then return true; end
 
 	local actor = self._occupants[self._jid_nick[actor_jid]];
-	if actor.role == "moderator" then
+	if actor and actor.role == "moderator" then
 		if occupant.affiliation ~= "owner" and occupant.affiliation ~= "admin" then
 			if actor.affiliation == "owner" or actor.affiliation == "admin" then
 				return true;