More error messages
Merge pull request #87 from fabian1995/master

More error messages