Change teh exception
6 files changed