initial error handling
Merge branch 'master' of git@github.com:k-langer/Project1_CS3600