Added better Exception support.
Merge branch 'master' of https://github.com/lewismar/csc207-hw4