Updated exception management