Added more error messages