Fix for Customer error messages