# HG changeset patch
# User Waqas Hussain <waqas20@gmail.com>
# Date 1285599074 -18000
# Node ID 72cb8b6536b92f77dc37cf23232aaa9093e539ff
# Parent  0f46acca11ccbece8f7ae7d48766097a3f8f564c# Parent  9e4c2b048f9a12246c743ee1c365d89424a7d012
Merge with trunk.

diff -r 9e4c2b048f9a -r 72cb8b6536b9 plugins/muc/muc.lib.lua
--- a/plugins/muc/muc.lib.lua	Sun Sep 26 18:15:30 2010 +0200
+++ b/plugins/muc/muc.lib.lua	Mon Sep 27 19:51:14 2010 +0500
@@ -251,7 +251,7 @@
 
 local function build_unavailable_presence_from_error(stanza)
 	local type, condition, text = stanza:get_error();
-	local error_message = "Kicked: "..condition:gsub("%-", " ");
+	local error_message = "Kicked: "..(condition and condition:gsub("%-", " ") or "presence error");
 	if text then
 		error_message = error_message..": "..text;
 	end