Add error checks. Remove callbacks.
Merge pull request #18 from MichaelHatherly/mh/error-checks

Add error checks. Remove callbacks.