More error handling
Merge branch 'master' of https://github.com/cpe187/CPE187-S14