Updated the error handler to be able to handle situations when error-suppression is used.