Working on error handling.
25 files changed