Updated exception reporting