--- a/core/s2smanager.lua	Fri Dec 24 04:52:40 2010 +0000
+++ b/core/s2smanager.lua	Fri Dec 24 04:56:02 2010 +0000
@@ -190,7 +190,11 @@
 		
 		if connect ~= false then
 			-- Kick the connection attempting machine into life
-			attempt_connection(host_session);
+			if not attempt_connection(host_session) then
+				-- Intentionally not returning here, the
+				-- session is needed, connected or not
+				destroy_session(host_session);
+			end
 		end
 		
 		if not host_session.sends2s then