Adding error checks
Merge pull request #15 from TheRyanHowell/feature/Dev

Adding error checks