Add support for long and more descriptive error messages