Adding support for error reporting!