changed: Followup - better error messages