Updated exception class