Updated exception handlers