diff --git a/sgx-bwmsgsv2.rb b/sgx-bwmsgsv2.rb
index 33cd77a9864704cf3a6d7a78d63fd97a9f5b19a4..d8ec1cb5a9a1009a981d4e86d49e503da0c7806a 100755
--- a/sgx-bwmsgsv2.rb
+++ b/sgx-bwmsgsv2.rb
@@ -865,10 +865,10 @@ class WebhookHandler < Goliath::API
 			#', state: ' + jparams['state'] +
 			', deliveryState: ' + (jparams['deliveryState'] ?
 				jparams['deliveryState'] : 'NONE') +
-			', deliveryCode: ' + (jparams['deliveryCode'] ?
-				jparams['deliveryCode'] : 'NONE') +
-			', deliveryDesc: ' + (jparams['deliveryDescription'] ?
-				jparams['deliveryDescription'] : 'NONE') +
+			', errorCode: ' + (jparams['errorCode'] ?
+				jparams['errorCode'] : 'NONE') +
+			', description: ' + (jparams['description'] ?
+				jparams['description'] : 'NONE') +
 			', tag: ' + (jparams['tag'] ? jparams['tag'] : 'NONE') +
 			', media: ' + (jparams['media'] ?
 				jparams['media'].to_s : 'NONE')
@@ -1017,11 +1017,11 @@ class WebhookHandler < Goliath::API
 
 				# TODO: add 'errorCode' and/or 'description' val
 				# create an error reply to the bare message
-				msg = Blather::StanzaError.new(
-					msg,
+				msg = msg.as_error(
 					'recipient-unavailable',
-					:wait
-				).to_node
+					:wait,
+					jparams['description']
+				)
 
 				# TODO: make prettier: this should be done above
 				others_num = params['_json'][0]['to']