CMS-2686 Clean-up exceptions