fix error reporting to not rethrow events
fix error reporting to not rethrow events