error messages improved