--- a/plugins/s2s/mod_s2s.lua	Mon Mar 05 11:07:10 2012 +0000
+++ b/plugins/s2s/mod_s2s.lua	Mon Mar 05 16:39:50 2012 +0000
@@ -280,7 +280,6 @@
 		end
 	end
 	(session.log or log)("info", "s2s disconnected: %s->%s (%s)", tostring(session.from_host), tostring(session.to_host), tostring(err or "closed"));
-	sessions[session.conn] = nil;
 	s2s_destroy_session(session, err);
 end
 
@@ -457,7 +456,7 @@
 			return; -- Connection lives, for now
 		end
 	end
-	sessions[conn]  = nil;
+	sessions[conn] = nil;
 end
 
 function listener.register_outgoing(conn, session)