added error messages, but need complement version with policy still (and name of distribution & policy?)