Adding support for "@error"