Added ErrorReporter support