Issue #2
- layed the groundwork for error checking
Merge pull request #50 from philstark/Logging-Issue_36

Issue #2