#7: add better errors
Merge pull request #12 from cloud-duke/task/7-add-better-errors

#7: add better errors