Implemented new exception layer