# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1472658039 -3600
# Node ID c07f0186979594a6715575fed65b581e3298b907
# Parent  e9d7a409e236391d41f27a608dc8479b23b32bf1# Parent  d91ef1e6afc28fe3aff175dc7c17ff8442d94ebd
Merge 0.10->trunk

diff -r e9d7a409e236 -r c07f01869795 core/stanza_router.lua
--- a/core/stanza_router.lua	Wed Aug 31 16:25:21 2016 +0100
+++ b/core/stanza_router.lua	Wed Aug 31 16:40:39 2016 +0100
@@ -36,7 +36,12 @@
 		-- A normal stanza
 		local st_type = stanza.attr.type;
 		if st_type == "error" or (name == "iq" and st_type == "result") then
-			log("debug", "Discarding %s from %s of type: %s", name, origin_type, st_type or '<nil>');
+			if st_type == "error" then
+				local err_type, err_condition, err_message = stanza:get_error();
+				log("debug", "Discarding unhandled error %s (%s, %s) from %s: %s", name, err_type, err_condition or "unknown condition", origin_type, stanza:top_tag());
+			else
+				log("debug", "Discarding %s from %s of type: %s", name, origin_type, st_type or '<nil>');
+			end
 			return;
 		end
 		if name == "iq" and (st_type == "get" or st_type == "set") and stanza.tags[1] then