Added more information to error messages