Improve error message handling.
1 file changed