More explicit error messages && file checking correction