diff --git a/sgx-bwmsgsv2.rb b/sgx-bwmsgsv2.rb
index 4a960beb4a9b79414124c03cc2645ee45914af9d..5d5e35a433c5b53351549f0539c4b520d2d744a4 100755
--- a/sgx-bwmsgsv2.rb
+++ b/sgx-bwmsgsv2.rb
@@ -939,20 +939,28 @@ class WebhookHandler < Goliath::API
 			resourcepart = WEBrick::HTTPUtils.unescape(tag_parts[1])
 
 			case type
-			when 'not-delivered'
-				# TODO: update above label
+			when 'message-failed'
 				# create a bare message like the one user sent
 				msg = Blather::Stanza::Message.new(
 					others_num + '@' + ARGV[0])
 				msg.from = bare_jid + '/' + resourcepart
 				msg['id'] = id
 
+				# TODO: remove this hack
+				if jparams['to'].length > 1
+					puts "WARN! group no rcpt: #{users_num}"
+					return [200, {}, "OK"]
+				end
+
 				# create an error reply to the bare message
 				msg = Blather::StanzaError.new(
 					msg,
 					'recipient-unavailable',
 					:wait
 				).to_node
+
+				# TODO: make prettier: this should be done above
+				others_num = params['_json'][0]['to']
 			when 'message-delivered'
 				# TODO: remove this hack
 				if jparams['to'].length > 1