Change error reporting in catch blocks