Necessary error-checking
Merge pull request #233 from jaredbischof/master

Necessary error-checking