Week 9 - Individual Assignment
Added error exceptions to the code
Merge origin/master