Add better error messages
Merge pull request #5 from mirego/feature/better-error-messages

Add better error messages