Merge pull request #74 from dlsniper/better-error-messages

Better error messages