--- a/core/s2smanager.lua	Tue Nov 24 20:35:18 2009 +0000
+++ b/core/s2smanager.lua	Wed Nov 25 03:30:41 2009 +0000
@@ -79,6 +79,10 @@
 end
 
 function send_to_host(from_host, to_host, data)
+	if not hosts[from_host] then
+		log("warn", "Attempt to send stanza from %s - a host we don't serve", from_host);
+		return false;
+	end
 	local host = hosts[from_host].s2sout[to_host];
 	if host then
 		-- We have a connection to this host already