diff -r 218075f1daf4 -r cee81a5ae949 core/stanza_router.lua
--- a/core/stanza_router.lua	Fri Jul 10 02:38:50 2009 +0100
+++ b/core/stanza_router.lua	Fri Jul 10 02:50:57 2009 +0100
@@ -173,7 +173,10 @@
 		core_post_stanza(origin, stanza);
 	elseif origin.type == "c2s" then
 		-- Remote host
-		if not hosts[from_host].disallow_s2s then
+		if not hosts[from_host] then
+			log("error", "No hosts[from_host] (please report): %s", tostring(stanza));
+		end
+		if (not hosts[from_host]) or (not hosts[from_host].disallow_s2s) then
 			local xmlns = stanza.attr.xmlns;
 			--stanza.attr.xmlns = "jabber:server";
 			stanza.attr.xmlns = nil;