Reworking exceptions management