Improved some error messages