Global error handler cleanup - Metrics data-point overflow

Global error handler cleanup - Metrics data-point overflow #6986