Adding support for different error messages