Merge pull request #4 from treww/master

Added different errors.