Merge "Check and catch the callback transaction error" into tm-dev