- [jt] some changes to error reporting.