Fixed error messages
Merge pull request #1 from pwaldhauer/error-messages-fix

Fixed error messages