C2: added error messages