Fixes #13: Improve the error messages