# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1457358185 0
# Node ID 5e1fe4f0eb9c2f50571d5a971fab4ec7adf633e8
# Parent  44b39c02eb33527d931252eee9303faac93a1553# Parent  80923a1a8fe1a059825ef3836ea31f2eeee06f5a
Merge

diff -r 44b39c02eb33 -r 5e1fe4f0eb9c plugins/muc/mod_muc.lua
--- a/plugins/muc/mod_muc.lua	Mon Feb 15 16:28:22 2016 +1100
+++ b/plugins/muc/mod_muc.lua	Mon Mar 07 13:43:05 2016 +0000
@@ -255,9 +255,11 @@
 			-- Watch presence to create rooms
 			if stanza.attr.type == nil and stanza.name == "presence" then
 				room = muclib.new_room(room_jid);
-			else
+			elseif stanza.attr.type ~= "error" then
 				origin.send(st.error_reply(stanza, "cancel", "not-allowed"));
 				return true;
+			else
+				return;
 			end
 		end
 		return room[method](room, origin, stanza);