Improve error messages and fix transaction id reference.