Improve error message of commands