Began reworking error reporting mechanism