... so that we don't loose txn-id on error messages Change-Id: Ic9bd98be115b8d97cf5ab879e01cee25aad497af