Changes to implement new exception