Adding exception handling
27 files changed