Fixed issue 'CatchHandler ignores already invoked cleanup'