Backed out changeset 79bd7a3e906c

1 files changed, 4 insertions, 4 deletions

diff --git a/core/modulemanager.lua b/core/modulemanager.lua
index b0fb6cd9..f4893089 100644
--- a/core/modulemanager.lua
+++ b/core/modulemanager.lua
@@ -78,7 +78,7 @@ function load(name)
 	local success, ret = pcall(mod);
 	if not success then
 		log("error", "Error initialising module '%s': %s", name or "nil", ret or "nil");
-		return nil, ret;
+		return nil, err;
 	end
 	return true;
 end
@@ -92,15 +92,15 @@ function handle_stanza(origin, stanza)
 		if child then
 			local xmlns = child.attr.xmlns or xmlns;
 			log("debug", "Stanza of type %s from %s has xmlns: %s", name, origin_type, xmlns);
-			local handler = handlers[origin_type][name][xmlns];
-			if  handler then
+			local handler = handlers[origin_type][name] and handlers[origin_type][name][xmlns];
+			if handler then
 				log("debug", "Passing stanza to mod_%s", handler_info[handler].name);
 				return handler(origin, stanza) or true;
 			end
 		end
 	elseif handlers[origin_type] then
 		local handler = handlers[origin_type][name];
-		if  handler then
+		if handler then
 			handler = handler[xmlns];
 			if handler then
 				log("debug", "Passing stanza to mod_%s", handler_info[handler].name);