Improve error message anf description string