--- a/plugins/mod_limits.lua	Fri Apr 17 17:47:01 2026 +0100
+++ b/plugins/mod_limits.lua	Fri Apr 17 19:43:00 2026 +0100
@@ -67,6 +67,7 @@
 	-- [packed_truncated_ip] = count
 	local current_ips = module:shared("ips."..session_type);
 	module:hook(session_type.."-connected", function (event)
+		if not event.session then return; end
 		local session_ip = get_truncated_ip(event.conn);
 		local new_count = (current_ips[session_ip] or 0) + 1;
 		current_ips[session_ip] = new_count;
@@ -77,6 +78,7 @@
 	end);
 
 	module:hook(session_type.."-closed", function (event)
+		if not event.session then return; end
 		local session_ip = get_truncated_ip(event.conn);
 		local new_count = (current_ips[session_ip] or 0) - 1;
 		if new_count < 0 then

--- a/plugins/mod_s2s.lua	Fri Apr 17 17:47:01 2026 +0100
+++ b/plugins/mod_s2s.lua	Fri Apr 17 19:43:00 2026 +0100
@@ -936,6 +936,7 @@
 	if not session then -- New incoming connection
 		session = s2s_new_incoming(conn);
 		sessions[conn] = session;
+		event_data.session = session;
 		session.log("debug", "Incoming s2s connection");
 		module:fire_event("s2sin-connected", event_data)
 		initialize_session(session);