Started working on error handling.
Merge branch 'master' of https://github.com/lindgrenj6/2240