Added more error checking
Merge branch 'master' of https://github.com/regehr/solid_code_class