Improve error message displaying