Improve error format