Fix error handler to cater for supressed error messages (@-style)