diff --git a/lib/blather_ext.rb b/lib/blather_ext.rb
index 24bff4bd876896370ed9f58349af264f584f987c..a6b5f51d98fe9e7e25ac015eb3572f96530a9aa6 100644
--- a/lib/blather_ext.rb
+++ b/lib/blather_ext.rb
@@ -16,4 +16,14 @@ module Blather
 			})
 		end
 	end
+
+	class Stanza
+		class Message
+			def addresses
+				find("ns:addresses", ns: ADDRESSES_NS)
+					.first
+					&.find("ns:address", ns: ADDRESSES_NS)
+			end
+		end
+	end
 end
diff --git a/sgx_jmp.rb b/sgx_jmp.rb
index 90af99b78f022ff1d218a58c024afddc81b9beca..08dd5d574516df17553b78166cd340f4674c3024 100644
--- a/sgx_jmp.rb
+++ b/sgx_jmp.rb
@@ -300,9 +300,7 @@ message(
 	Sentry.get_current_scope.set_transaction_name("inbound_group_text")
 	log.info "Possible group text #{m.from}"
 
-	address = m.find("ns:addresses", ns: ADDRESSES_NS).first
-		&.find("ns:address", ns: ADDRESSES_NS)
-		&.find { |el| el["jid"].to_s.start_with?("customer_") }
+	address = m.addresses&.find { |el| el["jid"].to_s.start_with?("customer_") }
 	pass unless address
 
 	CustomerRepo