T-TEST: Improve error messages and coding style.