Code cleanup in CErrorHandler class