Adding part of exception handling
6 files changed