Improved error messages a bit.
Improved error messages a bit.