Added initial error reporting