CMS-2686 Clean-up exceptions
Trying to remove usage of SystemException, since it has invited to mis usage.