[WIP] Extend exception/cert handling

related to #28