CDB-1788 more exceptions changes