OC-11204 - Exception handling and abstraction

[WIP]