--- a/core/s2smanager.lua	Sun Feb 12 17:53:50 2012 +0000
+++ b/core/s2smanager.lua	Tue Feb 21 21:13:13 2012 +0100
@@ -410,7 +410,12 @@
 			(session.log or log)("debug", "certificate chain validation result: valid");
 			session.cert_chain_status = "valid";
 
-			local host = session.direction == "incoming" and session.from_host or session.to_host
+			local host;
+			if session.direction == "incoming" then
+				host = session.from_host;
+			else
+				host = session.to_host;
+			end
 
 			-- We'll go ahead and verify the asserted identity if the
 			-- connecting server specified one.