Update error handling
Merge pull request #15 from gina-alaska/update_errors

Update error handling